diff --git a/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml b/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml
index 3b46ca86d..dac127bd6 100644
--- a/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml
+++ b/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml
@@ -10,6 +10,21 @@
       <e p="Assembly-CSharp-firstpass.csproj" t="IncludeRecursive" />
       <e p="Assembly-CSharp.csproj" t="IncludeRecursive" />
       <e p="Assets" t="Include">
+        <e p="Allegorithmic" t="Include">
+          <e p="Plugins" t="Include">
+            <e p="engine_build_info.txt" t="Include" />
+            <e p="EULA.txt" t="Include" />
+            <e p="Substance.EditorHelper" t="Include">
+              <e p="Scripter.cs" t="Include" />
+              <e p="Substance.EditorHelper.asmdef" t="Include" />
+            </e>
+            <e p="Substance.Platform" t="Include">
+              <e p="NativeFunctions.cs" t="Include" />
+              <e p="Substance.Platform.asmdef" t="Include" />
+            </e>
+          </e>
+        </e>
+        <e p="FitToCamera.cs" t="Include" />
         <e p="Plugins" t="Include">
           <e p="AsyncAwaitUtil" t="Include">
             <e p="Source" t="Include">
@@ -1389,6 +1404,7 @@
               <e p="StationTowing.cs" t="Include" />
               <e p="Survey.cs" t="Include" />
               <e p="VelocityMatch.cs" t="Include" />
+              <e p="WanderTask.cs" t="Include" />
             </e>
             <e p="Attributes.cs" t="Include" />
             <e p="Behaviors" t="Include">
@@ -1438,11 +1454,10 @@
             <e p="Enums.cs" t="Include" />
             <e p="ExponentialCurve.cs" t="Include" />
             <e p="Extensions.cs" t="Include" />
-            <e p="GameContext.cs" t="Include" />
             <e p="GlobalData.cs" t="Include" />
-            <e p="IChangeSource.cs" t="Include" />
             <e p="ItemData.cs" t="Include" />
             <e p="ItemInstance.cs" t="Include" />
+            <e p="ItemManager.cs" t="Include" />
             <e p="JsonConverters.cs" t="Include" />
             <e p="LoadoutData.cs" t="Include" />
             <e p="MathFormatters.cs" t="Include" />
@@ -1907,7 +1922,6 @@
             <e p="ClickableCollider.cs" t="Include" />
             <e p="ClickCatcher.cs" t="Include" />
             <e p="ClickRaycaster.cs" t="Include" />
-            <e p="ColonyTab.cs" t="Include" />
             <e p="ConfirmationDialog.cs" t="Include" />
             <e p="ConsoleController.cs" t="Include" />
             <e p="ConsoleView.cs" t="Include" />
@@ -1970,6 +1984,7 @@
             <e p="VolumeRender.shader" t="Include" />
             <e p="VolumeSun.shader" t="Include" />
           </e>
+          <e p="ViewNormalEmissive.shader" t="Include" />
         </e>
         <e p="TextMesh Pro" t="Include">
           <e p="Fonts" t="Include">
@@ -2000,116 +2015,14 @@
           </e>
         </e>
       </e>
-      <e p="com.alelievr.NodeGraphProcessor.Editor.csproj" t="IncludeRecursive" />
-      <e p="com.alelievr.NodeGraphProcessor.Runtime.csproj" t="IncludeRecursive" />
       <e p="Economy.Shared.Unity.csproj" t="IncludeRecursive" />
       <e p="MessagePack.csproj" t="IncludeRecursive" />
       <e p="obj" t="ExcludeRecursive" />
       <e p="Packages" t="ExcludeRecursive" />
+      <e p="Substance.EditorHelper.csproj" t="IncludeRecursive" />
+      <e p="Substance.Platform.csproj" t="IncludeRecursive" />
       <e p="Temp\bin" t="ExcludeRecursive" />
       <e p="UniRx.csproj" t="IncludeRecursive" />
     </e>
-    <e p="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor" t="Include">
-      <e p="BaseGraphWindow.cs" t="Include" />
-      <e p="Callbacks" t="Include">
-        <e p="NodeGraphProcessorMenuItems.cs" t="Include" />
-        <e p="OnBaseGraphDeleted.cs" t="Include" />
-      </e>
-      <e p="com.alelievr.NodeGraphProcessor.Editor.asmdef" t="Include" />
-      <e p="EditorAttributes.cs" t="Include" />
-      <e p="GraphInspector.cs" t="Include" />
-      <e p="Logic" t="Include">
-        <e p="EdgeConnectorListener.cs" t="Include" />
-      </e>
-      <e p="NodeInspectorObject.cs" t="Include" />
-      <e p="Resources" t="Include">
-        <e p="GraphProcessorElements" t="Include">
-          <e p="PinnedElement.uxml" t="Include" />
-        </e>
-        <e p="GraphProcessorStyles" t="Include">
-          <e p="BaseGraphView.uss" t="Include" />
-          <e p="BaseNodeView.uss" t="Include" />
-          <e p="BaseStackNodeView.uss" t="Include" />
-          <e p="EdgeView.uss" t="Include" />
-          <e p="ExposedParameterView.uss" t="Include" />
-          <e p="GroupView.uss" t="Include" />
-          <e p="InspectorView.uss" t="Include" />
-          <e p="NodeSettings.uss" t="Include" />
-          <e p="PinnedElementView.uss" t="Include" />
-          <e p="PortView.uss" t="Include" />
-          <e p="RelayNode.uss" t="Include" />
-        </e>
-        <e p="NodeTemplate.cs.txt" t="Include" />
-        <e p="NodeViewTemplate.cs.txt" t="Include" />
-        <e p="UXML" t="Include">
-          <e p="NodeSettings.uxml" t="Include" />
-        </e>
-      </e>
-      <e p="Utils" t="Include">
-        <e p="BaseEdgeConnector.cs" t="Include" />
-        <e p="BaseEdgeDragHelper.cs" t="Include" />
-        <e p="CopyPasteHelper.cs" t="Include" />
-        <e p="FieldFactory.cs" t="Include" />
-        <e p="NodeProvider.cs" t="Include" />
-        <e p="StackNodeViewProvider.cs" t="Include" />
-      </e>
-      <e p="Views" t="Include">
-        <e p="BaseGraphView.cs" t="Include" />
-        <e p="BaseNodeView.cs" t="Include" />
-        <e p="BaseStackNodeView.cs" t="Include" />
-        <e p="CreateNodeMenuWindow.cs" t="Include" />
-        <e p="EdgeView.cs" t="Include" />
-        <e p="ExposedParameterFieldView.cs" t="Include" />
-        <e p="ExposedParameterPropertyView.cs" t="Include" />
-        <e p="ExposedParameterView.cs" t="Include" />
-        <e p="GroupView.cs" t="Include" />
-        <e p="MiniMapView.cs" t="Include" />
-        <e p="NodeBadgeView.cs" t="Include" />
-        <e p="NodeSettingsView.cs" t="Include" />
-        <e p="ParameterNodeView.cs" t="Include" />
-        <e p="PinnedElementView.cs" t="Include" />
-        <e p="PortView.cs" t="Include" />
-        <e p="ProcessorView.cs" t="Include" />
-        <e p="RelayNodeView.cs" t="Include" />
-        <e p="StickyNoteView.cs" t="Include" />
-        <e p="ToolbarView.cs" t="Include" />
-      </e>
-    </e>
-    <e p="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime" t="Include">
-      <e p="com.alelievr.NodeGraphProcessor.Runtime.asmdef" t="Include" />
-      <e p="Elements" t="Include">
-        <e p="BaseNode.cs" t="Include" />
-        <e p="BaseStackNode.cs" t="Include" />
-        <e p="Group.cs" t="Include" />
-        <e p="NodePort.cs" t="Include" />
-        <e p="ParameterNode.cs" t="Include" />
-        <e p="PinnedElement.cs" t="Include" />
-        <e p="RelayNode.cs" t="Include" />
-        <e p="StickyNote.cs" t="Include" />
-      </e>
-      <e p="Graph" t="Include">
-        <e p="Attributes.cs" t="Include" />
-        <e p="BaseGraph.cs" t="Include" />
-      </e>
-      <e p="PackageInfo.cs" t="Include" />
-      <e p="Processing" t="Include">
-        <e p="BaseGraphProcessor.cs" t="Include" />
-        <e p="CustomPortIO.cs" t="Include" />
-        <e p="JobGraphProcessor.cs" t="Include" />
-        <e p="ProcessGraphProcessor.cs" t="Include" />
-        <e p="TypeAdapter.cs" t="Include" />
-      </e>
-      <e p="Utils" t="Include">
-        <e p="AppDomainExtension.cs" t="Include" />
-        <e p="ExceptionToLog.cs" t="Include" />
-        <e p="GraphUtils.cs" t="Include" />
-        <e p="JsonSerializer.cs" t="Include" />
-        <e p="MessageType.cs" t="Include" />
-        <e p="SerializableEdge.cs" t="Include" />
-        <e p="SerializableType.cs" t="Include" />
-        <e p="SerrializableObject.cs" t="Include" />
-        <e p="TypeExtension.cs" t="Include" />
-      </e>
-    </e>
   </component>
 </project>
\ No newline at end of file
diff --git a/Aetheria-Economy.sln b/Aetheria-Economy.sln
index 020a6e80f..97cfbc1e8 100644
--- a/Aetheria-Economy.sln
+++ b/Aetheria-Economy.sln
@@ -11,12 +11,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MessagePack", "MessagePack.csproj", "{c511ef21-dc27-883d-b027-9a4b6f36bae4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "com.alelievr.NodeGraphProcessor.Runtime", "com.alelievr.NodeGraphProcessor.Runtime.csproj", "{4cc9ece5-0f74-bceb-733d-48f6e84c547b}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Substance.EditorHelper", "Substance.EditorHelper.csproj", "{dd909206-f54e-1c12-ed74-b4e22d464f6a}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Substance.Platform", "Substance.Platform.csproj", "{2ca9591a-f6e2-fafd-e598-0f0563c5ae57}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{a7fc89e3-14ca-fb82-7d67-c13788bee74a}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "com.alelievr.NodeGraphProcessor.Editor", "com.alelievr.NodeGraphProcessor.Editor.csproj", "{a4e83803-35fe-e54d-5974-2af6595e46a5}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor-firstpass", "Assembly-CSharp-Editor-firstpass.csproj", "{b813e4c7-10f6-4f4d-0de5-991510834dc3}"
 EndProject
 Global
@@ -45,18 +45,18 @@ Global
 		{c511ef21-dc27-883d-b027-9a4b6f36bae4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{c511ef21-dc27-883d-b027-9a4b6f36bae4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{c511ef21-dc27-883d-b027-9a4b6f36bae4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4cc9ece5-0f74-bceb-733d-48f6e84c547b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4cc9ece5-0f74-bceb-733d-48f6e84c547b}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4cc9ece5-0f74-bceb-733d-48f6e84c547b}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4cc9ece5-0f74-bceb-733d-48f6e84c547b}.Release|Any CPU.Build.0 = Release|Any CPU
+		{dd909206-f54e-1c12-ed74-b4e22d464f6a}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{dd909206-f54e-1c12-ed74-b4e22d464f6a}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{dd909206-f54e-1c12-ed74-b4e22d464f6a}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{dd909206-f54e-1c12-ed74-b4e22d464f6a}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2ca9591a-f6e2-fafd-e598-0f0563c5ae57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2ca9591a-f6e2-fafd-e598-0f0563c5ae57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2ca9591a-f6e2-fafd-e598-0f0563c5ae57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2ca9591a-f6e2-fafd-e598-0f0563c5ae57}.Release|Any CPU.Build.0 = Release|Any CPU
 		{a7fc89e3-14ca-fb82-7d67-c13788bee74a}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{a7fc89e3-14ca-fb82-7d67-c13788bee74a}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{a7fc89e3-14ca-fb82-7d67-c13788bee74a}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{a7fc89e3-14ca-fb82-7d67-c13788bee74a}.Release|Any CPU.Build.0 = Release|Any CPU
-		{a4e83803-35fe-e54d-5974-2af6595e46a5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{a4e83803-35fe-e54d-5974-2af6595e46a5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{a4e83803-35fe-e54d-5974-2af6595e46a5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{a4e83803-35fe-e54d-5974-2af6595e46a5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{b813e4c7-10f6-4f4d-0de5-991510834dc3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{b813e4c7-10f6-4f4d-0de5-991510834dc3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{b813e4c7-10f6-4f4d-0de5-991510834dc3}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/Aetheria-Economy.sln.DotSettings b/Aetheria-Economy.sln.DotSettings
index 6fe2fe3f8..458e07f40 100644
--- a/Aetheria-Economy.sln.DotSettings
+++ b/Aetheria-Economy.sln.DotSettings
@@ -1,5 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=equippable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Hardpoint/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hardpoints/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Loadout/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Planetoid/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Assembly-CSharp-Editor-firstpass.csproj b/Assembly-CSharp-Editor-firstpass.csproj
index 4e18d6ffa..3d6db1b77 100644
--- a/Assembly-CSharp-Editor-firstpass.csproj
+++ b/Assembly-CSharp-Editor-firstpass.csproj
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Temp\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0169</NoWarn>
@@ -369,6 +369,15 @@
  <Reference Include="Grpc.Core.Api">
  <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Editor">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
+ </Reference>
+ <Reference Include="Substance.Game">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.dll</HintPath>
+ </Reference>
+ <Reference Include="SourceUnityLib">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ </Reference>
  <Reference Include="nunit.framework">
  <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
  </Reference>
@@ -727,14 +736,6 @@
       <Project>{c2362ba6-dee9-92b9-0779-f5fcf5968986}</Project>
       <Name>Economy.Shared.Unity</Name>
     </ProjectReference>
-    <ProjectReference Include="com.alelievr.NodeGraphProcessor.Runtime.csproj">
-      <Project>{4cc9ece5-0f74-bceb-733d-48f6e84c547b}</Project>
-      <Name>com.alelievr.NodeGraphProcessor.Runtime</Name>
-    </ProjectReference>
-    <ProjectReference Include="com.alelievr.NodeGraphProcessor.Editor.csproj">
-      <Project>{a4e83803-35fe-e54d-5974-2af6595e46a5}</Project>
-      <Name>com.alelievr.NodeGraphProcessor.Editor</Name>
-    </ProjectReference>
     <ProjectReference Include="UniRx.csproj">
       <Project>{4d885cb7-1f9e-abb3-b070-7265b432ecda}</Project>
       <Name>UniRx</Name>
@@ -743,6 +744,14 @@
       <Project>{c511ef21-dc27-883d-b027-9a4b6f36bae4}</Project>
       <Name>MessagePack</Name>
     </ProjectReference>
+    <ProjectReference Include="Substance.EditorHelper.csproj">
+      <Project>{dd909206-f54e-1c12-ed74-b4e22d464f6a}</Project>
+      <Name>Substance.EditorHelper</Name>
+    </ProjectReference>
+    <ProjectReference Include="Substance.Platform.csproj">
+      <Project>{2ca9591a-f6e2-fafd-e598-0f0563c5ae57}</Project>
+      <Name>Substance.Platform</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj
index fa2537492..8bb2aafcf 100644
--- a/Assembly-CSharp-Editor.csproj
+++ b/Assembly-CSharp-Editor.csproj
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Temp\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0169</NoWarn>
@@ -430,6 +430,15 @@
  <Reference Include="Grpc.Core.Api">
  <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Editor">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
+ </Reference>
+ <Reference Include="Substance.Game">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.dll</HintPath>
+ </Reference>
+ <Reference Include="SourceUnityLib">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ </Reference>
  <Reference Include="nunit.framework">
  <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
  </Reference>
@@ -796,14 +805,6 @@
       <Project>{c2362ba6-dee9-92b9-0779-f5fcf5968986}</Project>
       <Name>Economy.Shared.Unity</Name>
     </ProjectReference>
-    <ProjectReference Include="com.alelievr.NodeGraphProcessor.Runtime.csproj">
-      <Project>{4cc9ece5-0f74-bceb-733d-48f6e84c547b}</Project>
-      <Name>com.alelievr.NodeGraphProcessor.Runtime</Name>
-    </ProjectReference>
-    <ProjectReference Include="com.alelievr.NodeGraphProcessor.Editor.csproj">
-      <Project>{a4e83803-35fe-e54d-5974-2af6595e46a5}</Project>
-      <Name>com.alelievr.NodeGraphProcessor.Editor</Name>
-    </ProjectReference>
     <ProjectReference Include="UniRx.csproj">
       <Project>{4d885cb7-1f9e-abb3-b070-7265b432ecda}</Project>
       <Name>UniRx</Name>
@@ -812,6 +813,14 @@
       <Project>{c511ef21-dc27-883d-b027-9a4b6f36bae4}</Project>
       <Name>MessagePack</Name>
     </ProjectReference>
+    <ProjectReference Include="Substance.EditorHelper.csproj">
+      <Project>{dd909206-f54e-1c12-ed74-b4e22d464f6a}</Project>
+      <Name>Substance.EditorHelper</Name>
+    </ProjectReference>
+    <ProjectReference Include="Substance.Platform.csproj">
+      <Project>{2ca9591a-f6e2-fafd-e598-0f0563c5ae57}</Project>
+      <Name>Substance.Platform</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/Assembly-CSharp-firstpass.csproj b/Assembly-CSharp-firstpass.csproj
index 457332560..fb9295b16 100644
--- a/Assembly-CSharp-firstpass.csproj
+++ b/Assembly-CSharp-firstpass.csproj
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Temp\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0169</NoWarn>
@@ -429,6 +429,9 @@
  <Reference Include="Grpc.Core.Api">
  <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Game">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.dll</HintPath>
+ </Reference>
  <Reference Include="mscorlib">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
  </Reference>
@@ -780,14 +783,6 @@
       <Project>{c2362ba6-dee9-92b9-0779-f5fcf5968986}</Project>
       <Name>Economy.Shared.Unity</Name>
     </ProjectReference>
-    <ProjectReference Include="com.alelievr.NodeGraphProcessor.Runtime.csproj">
-      <Project>{4cc9ece5-0f74-bceb-733d-48f6e84c547b}</Project>
-      <Name>com.alelievr.NodeGraphProcessor.Runtime</Name>
-    </ProjectReference>
-    <ProjectReference Include="com.alelievr.NodeGraphProcessor.Editor.csproj">
-      <Project>{a4e83803-35fe-e54d-5974-2af6595e46a5}</Project>
-      <Name>com.alelievr.NodeGraphProcessor.Editor</Name>
-    </ProjectReference>
     <ProjectReference Include="UniRx.csproj">
       <Project>{4d885cb7-1f9e-abb3-b070-7265b432ecda}</Project>
       <Name>UniRx</Name>
@@ -796,6 +791,14 @@
       <Project>{c511ef21-dc27-883d-b027-9a4b6f36bae4}</Project>
       <Name>MessagePack</Name>
     </ProjectReference>
+    <ProjectReference Include="Substance.EditorHelper.csproj">
+      <Project>{dd909206-f54e-1c12-ed74-b4e22d464f6a}</Project>
+      <Name>Substance.EditorHelper</Name>
+    </ProjectReference>
+    <ProjectReference Include="Substance.Platform.csproj">
+      <Project>{2ca9591a-f6e2-fafd-e598-0f0563c5ae57}</Project>
+      <Name>Substance.Platform</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
index c9ec24d59..30251ec65 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Temp\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0169</NoWarn>
@@ -289,7 +289,6 @@
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Spline\Bundling\CdtIntersections.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Core\GraphAlgorithms\TopologicalSort.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Core\Geometry\RTree\RTree.cs" />
-     <Compile Include="Assets\Scripts\UI\ColonyTab.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\ShapeObstacleCalculator.cs" />
      <Compile Include="Assets\Scripts\NIH\MIConvexHull\ConvexHull\DataModel.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Spline\ConeSpanner\RightVertexEvent.cs" />
@@ -676,6 +675,7 @@
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Rectilinear\BasicReflectionEvent.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Layout\Layered\IntEdge.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Spline\Bundling\PointPairOrder.cs" />
+     <Compile Include="Assets\FitToCamera.cs" />
      <None Include="Assets\TextMesh Pro\Resources\Shaders\TMPro.cginc" />
      <None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Mobile Overlay.shader" />
      <None Include="Assets\Shaders\Clouds.shader" />
@@ -684,6 +684,7 @@
      <None Include="Assets\Resources\Sprites\Attribution.txt" />
      <None Include="Assets\Scripts\NIH\GPU Noise\ClassicNoise2D.cginc" />
      <None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_Bitmap.shader" />
+     <None Include="Assets\Allegorithmic\Plugins\EULA.txt" />
      <None Include="Assets\Scripts\NIH\GPU Noise\SimplexNoiseGrad2D.cginc" />
      <None Include="Assets\Shaders\GalaxyMap.shader" />
      <None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface-Mobile.shader" />
@@ -693,6 +694,7 @@
      <None Include="Assets\Shaders\Brushes\PowerBrush.shader" />
      <None Include="Assets\Shaders\DitheredParticles.shader" />
      <None Include="Assets\Shaders\Raymarching\VolumeJupiter.shader" />
+     <None Include="Assets\Shaders\ViewNormalEmissive.shader" />
      <None Include="Assets\Shaders\Brushes\CubicPulseBrush.shader" />
      <None Include="Assets\Scripts\NIH\GPU Noise\SimplexNoiseGrad3D.cginc" />
      <None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface.shader" />
@@ -706,6 +708,7 @@
      <None Include="Assets\Shaders\Raymarching\VolumeRender.shader" />
      <None Include="Assets\Shaders\Background.shader" />
      <None Include="Assets\Shaders\Brushes\RadialWaveBrush.shader" />
+     <None Include="Assets\Allegorithmic\Plugins\engine_build_info.txt" />
      <None Include="Assets\TextMesh Pro\Resources\LineBreaking Following Characters.txt" />
      <None Include="Assets\Scripts\NIH\GPU Noise\ClassicNoise3D.cginc" />
      <None Include="Assets\Shaders\Dither Functions.cginc" />
@@ -1019,6 +1022,9 @@
  <Reference Include="Grpc.Core.Api">
  <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Game">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.dll</HintPath>
+ </Reference>
  <Reference Include="mscorlib">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
  </Reference>
@@ -1374,14 +1380,6 @@
       <Project>{c2362ba6-dee9-92b9-0779-f5fcf5968986}</Project>
       <Name>Economy.Shared.Unity</Name>
     </ProjectReference>
-    <ProjectReference Include="com.alelievr.NodeGraphProcessor.Runtime.csproj">
-      <Project>{4cc9ece5-0f74-bceb-733d-48f6e84c547b}</Project>
-      <Name>com.alelievr.NodeGraphProcessor.Runtime</Name>
-    </ProjectReference>
-    <ProjectReference Include="com.alelievr.NodeGraphProcessor.Editor.csproj">
-      <Project>{a4e83803-35fe-e54d-5974-2af6595e46a5}</Project>
-      <Name>com.alelievr.NodeGraphProcessor.Editor</Name>
-    </ProjectReference>
     <ProjectReference Include="UniRx.csproj">
       <Project>{4d885cb7-1f9e-abb3-b070-7265b432ecda}</Project>
       <Name>UniRx</Name>
@@ -1390,6 +1388,14 @@
       <Project>{c511ef21-dc27-883d-b027-9a4b6f36bae4}</Project>
       <Name>MessagePack</Name>
     </ProjectReference>
+    <ProjectReference Include="Substance.EditorHelper.csproj">
+      <Project>{dd909206-f54e-1c12-ed74-b4e22d464f6a}</Project>
+      <Name>Substance.EditorHelper</Name>
+    </ProjectReference>
+    <ProjectReference Include="Substance.Platform.csproj">
+      <Project>{2ca9591a-f6e2-fafd-e598-0f0563c5ae57}</Project>
+      <Name>Substance.Platform</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/Assets/Allegorithmic.meta b/Assets/Allegorithmic.meta
new file mode 100644
index 000000000..6fee42463
--- /dev/null
+++ b/Assets/Allegorithmic.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b867b59e5b8eed74db7b2c18e04227bd
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins.meta b/Assets/Allegorithmic/Plugins.meta
new file mode 100644
index 000000000..5b3b48a53
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 15d9de6aa01509942b8bebca15f060bf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/EULA.txt b/Assets/Allegorithmic/Plugins/EULA.txt
new file mode 100644
index 000000000..2e6c41ba1
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/EULA.txt
@@ -0,0 +1,468 @@
+SUBSTANCE GENERAL TERMS AND CONDITIONS
+ALL PRODUCTS
+Last updated – March 24, 2020
+PLEASE READ THE AGREEMENT CAREFULLY BEFORE DOWNLOADING, INSTALLING OR USING THE SOFTWARE OR THE COPYRIGHTED ASSET.
+CLICKING THE “AGREE” BUTTON FOR DOWNLOADED SOFTWARE OR COPYRIGHTED ASSETS, OR USING THE SOFTWARE OR COPYRIGHTED ASSETS MEANS THAT YOU ACCEPT THE TERMS AND CONDITIONS OF THIS AGREEMENT.
+IF YOU ARE CONSUMER OR NON-PROFESSIONAL, YOU UNDERSTAND AND AGREE THAT BY DOWNLOADING ANY SOFTWARE OR COPYRIGHTED ASSET IMMEDIATELY AFTER ACCEPTING THIS AGREEMENT, YOU ARE HEREBY LOSING YOUR WITHDRAWAL RIGHT.
+ACCEPTANCE
+Your Use of the Software or the Copyrighted Assets is subject to your acceptance of these General Terms and Conditions as well as your acceptance of additional terms and conditions. The Agreement incorporates by reference the following documents: (i) these General Terms and Conditions containing the general terms and conditions applicable to all Allegorithmic Software and all Copyrighted Assets, (ii) the Specific Terms and Conditions (including Terms of Use) containing the additional terms for the particular Software or Copyrighted Asset you are licensing and related fees, (iii) any Third Party Licenses governing the use of certain third party software which might be embedded in the Software or in the Copyrighted Asset you are licensing under the Agreement. When the term “Agreement” is used in any of these documents, Allegorithmic is referring collectively to all of them i.e. to (i), (ii) and (iii) above. The Agreement is effective as of the date You accept the Agreement as part of Allegorithmic’s online licensing process.
+In the event of a conflict between the terms set out in these General Terms and Conditions and the terms set out in the Specific Terms and Conditions, the terms of these General Terms and Conditions shall prevail unless expressly stated otherwise in the Specific Terms and Conditions.
+1. DEFINITIONS
+In this Agreement, capitalized terms shall have the meaning ascribed to them in this Section 1 or elsewhere in this Agreement.
+“Agreement” includes (i) these General Terms and Conditions, (ii) the Specific Terms and Conditions and (iii) the Third-Party Licenses which are incorporated hereto by reference.
+“Allegorithmic” means a French limited liability company with its registered office at 3 avenue Julien, 63000 Clermont-Ferrand, France, which is developer and sole owner of the Software and certain Copyrighted Assets, subject to third party’s rights into the Software.
+“Allegorithmic Account” means the subscription account of an Allegorithmic User, to be granted a limited monthly or yearly term-license on the Substance toolset as defined below, renewable on a monthly or yearly basis.
+“Allegorithmic Copyrighted Asset” means a copyrighted asset owned by Allegorithmic.
+“Copyrighted Asset” means interactive media content including without limitation materials, brushes, patches, High Dynamic Range Images (HDRI’s), meshes, Substance files and any other form of works which are subject to copyright laws, that are distributed either through (i) an Allegorithmic proprietary License on Substance Source or another proprietary Allegorithmic platform or (ii) a Creative Commons License on Substance Share.
+“Commercials Terms” means the Fees payable by You as set out on the Allegorithmic Website, quotes, invoices, price list, or applicable Specific Terms and Conditions as the case might be, for You Use of the Software or the Copyrighted Assets.
+“Commercial Use” means the Use of the Software or the Copyrighted Assets for direct or indirect income-generating purposes.
+“Consumer” means an individual person acquiring the Software or the Copyrighted Asset for purposes which are outside of that individual’s trade, business, craft or profession, and that such individual is not making any Commercial Use of the Software.
+“Creative Commons License” means a public license governing Your Use of any Copyrighted Assets distributed on Substance Share.
+“Documentation” means the user manuals, instructions and tutorials for the Software or the Copyrighted Assets owned by Allegorithmic that Allegorithmic generally makes available to its end-user customers.
+“Fee” shall mean any fee, cost and expense as set out in the Commercial Terms that are payable for Your Use of the Software or the Copyrighted Assets.
+“Intellectual Property Rights” means any current and future intellectual property rights, including copyrights, trademarks, trade names, business names, domain names, design rights, inventions, confidential information, trade secrets and know-how including commercial know-how, patents, utility models, database rights, and all similar or analogous proprietary rights of whatever nature and in each case in any part of the world and whether or not registered or registrable including, in relation to the above, all granted registrations and all applications for registration and any renewals, reversions, and extensions.
+“Legal Entity” means any company, corporation, limited liability company, general partnership, limited partnership, limited liability partnership, proprietorship, joint venture or other form of business organization, and includes, without limitation, any government, non-for-profit, educational or academic institution, including but not limited to any primary or secondary school, vocational school, college or university. The License subscribed by a Legal Entity in consideration of its Revenue shall only serve the purpose of this Legal Entity and may not be extended to its subsidiaries or affiliated companies without Allegorithmic prior written consent. License(s) subscribed by a wholly-owned or more than ninety (90) %-owned affiliated Legal Entity of a group shall be subscribed in consideration of the whole group aggregated Revenue.
+“License” shall mean the limited right to Use the Software or the Copyrighted Assets as further detailed in these General Terms and Conditions and in the applicable Specific Terms and Conditions. Please find below the definition of available licenses:
+“Academic License” means a License to Use the Software granted to either an educational or academic Legal Entity. Academic Licenses are intended for academic and educational Use, and shall not serve any Commercial Use.
+“Enterprise License” means a License to the Software or to the Copyrighted Asset(s) granted to Legal Entities (i) which main business activity is not video game development, visual effects, animation and which are not educational and/or academic (ii) whether commercial or non-profit, with Revenue exceeding US$100,000,000. Enterprise Licenses cannot be subscribed to on Allegorithmic website. A User requesting an Enterprise License must contact Allegorithmic directly to be provided a service description and quotation. Government entities may not subscribe to Enterprise Licenses.
+“Evaluation License” means a License granted to the User for a limited version of the Software (“the Evaluation Software”) for a limited duration, generally of thirty (30) days unless agreed expressly otherwise by Allegorithmic (“the Evaluation Term”), to enable the User to evaluate the Software in connection with the User’s internal business purposes to determine whether to purchase the non-evaluation version of the Software. Commercial Use, publishing or redistribution of the Software, the Substance files or the Licensee Content is strictly forbidden under an Evaluation License.
+“Floating License” means a License allowing to share the Use of the Software between several individual Users of a Legal Entity. Users of the Floating License can Use the Software simultaneously on any number of computers provided that a License for the number of computers using the Software simultaneously has been purchased. The Agreement applicable to the same Floating License’s group of users shall be the Agreement in force as of the first download by the Legal Entity, if applicable.
+“Indie License” means a License to Use the Software granted to either (i) an individual, being or not a professional user, or a Legal entity, whether commercial or non-profit, with Revenue not exceeding US$100,000 during the prior fiscal year. Government entities may not subscribe to Indie Licenses.
+“Not-For-Resale Purpose” or “NFR Purpose” means a License granted to the User for a limited duration to use the Software in a non-production environment for (i) internal developing and testing purposes or (ii) educational and internal training purposes, all on Your own premises and equipment. Commercial Use, publishing or redistribution of the Software, the Substances or the Licensee Content is strictly forbidden under a NFR License.
+“Pro License” means a License to the Software or the Copyrighted asset(s) granted (i) to a professional user or a commercial Legal Entity, whether commercial or non-profit, other than an educational and/or academic one, with annual Revenue between US$100,000 and US$100,000,000; (ii) or to a commercial Legal Entity which is part of the Video game industry, VFX industry or a Government Agency, with Revenue above US$100,000. For clarification purposes, any contractor working on behalf of the User shall subscribe to a Pro License if applicable, notwithstanding the contractor’s own revenue.
+“Student License” means a License to the Software or the Copyrighted Asset(s) granted to a (i) User who must be a student or teacher enrolled with an accredited educational institution, (ii) and not an educational, academic, non-profit or government Legal Entity. A Student license should be used exclusively for learning, and cannot be used for any Commercial Use, nor any use competing with Allegorithmic. As such, the Student License can be used to create a portfolio or any work created by the user during his studies or for contests. An evidence by his/her Student ID which shall be communicated to Allegorithmic at the time the request for a Student License is made. A Student License is valid for one (1) year.
+“Licensee Content” means textures, images or other contents otherwise called derivative works that You developed from Your Use of the Software or the Copyrighted Assets.
+“Non-Commercial Use” means Your Use of the Software or the Copyrighted Assets for all purposes in compliance with the terms of this Agreement but excludes expressly all Commercial Use.
+“Professional User” means a User making any Commercial Use of the Software and/or the Copyrighted Assets, provided that such User may be subscribing to an Indie License or a Pro License.
+“Revenue” means annual gross revenue, both operating and non-operating, or raised and/or granted funds, as accounted by the Legal Entity during the prior fiscal year. Revenue are defined in USD or an equivalent amount in another currency.
+“Software” means the Allegorithmic proprietary software product, licensed to You under the Specific Terms and Conditions that Allegorithmic and You entered into.
+“Specific Terms and Conditions” means the specific terms and conditions and/or terms of use containing the additional terms including the applicable Fees if any, governing Your Use of a particular Software or Copyrighted Asset.
+“Substance File” means the texture and/or filter either created from Your Use of the Software or made available to You as a Copyrighted Asset.
+“Substance Share” means the free on-line peer-to-peer exchange platform owned and operated by Allegorithmic from which a User may share, Use and build on the Copyrighted assets to create its Licensee Content in accordance with the Creative Commons License.
+“Substance Source” means the proprietary on-line content library owned and operated by Allegorithmic from which a User may purchase and download Copyrighted Assets that Allegorithmic distributes from time to time.
+“Term” means the duration of the License granted to You under the Agreement as set out in Section 12.1 of the General Terms and Conditions.
+“Third Party Licenses” means the terms and conditions of any third-party software which is embedded in the Software.
+“Third Party Provider” means a person not affiliated to Allegorithmic that provides Copyrighted Assets on Substance Share and/ or Substance Source.
+“Use” means the loading, installation and use of the Software or the Copyrighted Assets in accordance with the terms of the Agreement.
+“User” means an individual person who is authorized by Allegorithmic to Use the Software or the Copyrighted Assets.
+“Website” or “Allegorithmic website”: means this Website accessible at www.substance3d.com owned and operated by Allegorithmic;
+“You” means the User or the Legal Entity Using the Software or the Copyrighted Assets as licensee.
+“Your” means relating to You or made or done by You.
+2. CONDITION PRECEDENT TO THE LICENSING OF ANY SOFTWARE OR COPYRIGHTED ASSET
+You must accept the Specific Terms and Conditions applicable to a Software or Copyrighted Asset to be entitled to Use any Software or Copyrighted Asset. Your acceptance of these General Terms and Conditions alone does not grant you a right to Use any Software or Copyrighted Asset. Furthermore, Your acceptance of the Specific Terms and Conditions for a particular Software or Copyrighted Asset does not automatically grant You a right to Use other Software or Copyrighted Assets unless and until You accept the Specific Terms and Conditions applicable to the particular Software or Copyrighted Assets you intend to Use.
+3. GENERAL RESTRICTIONS APPLICABLE TO THE SOFTWARE
+With respect to the Software and except as expressly permitted under the Agreement:
+3.1 You shall not, and shall not assist, enable or otherwise permit or allow any third party to:
+•	copy (except in the course of loading or installing), alter, adapt, modify, translate, create derivative works of the Software,
+•	decompile, disassemble or otherwise reverse engineer or attempt to derive the source code of (unless expressly permitted under applicable law) or any technical data, know-how, trade secrets, processes, techniques, specifications, protocols, methods, algorithms, interfaces, ideas, solutions, structures or other information embedded or used in the Software,
+•	rent, lend, loan, lease, sell, encumber, distribute, sublicense, or otherwise permit use of or access to the Software by third parties,
+•	remove, alter, or obscure any proprietary or restrictive notices affixed to or contained in the Software,
+•	circumvent or attempt to circumvent any technological protective measure contained in or supported by, the Software; or any copy, portion, extract or derivative thereof,
+•	use the Software in any manner that violates any applicable law or regulation whether local, national or international,
+•	use the Software in any manner that violates any Intellectual Property Rights or privacy rights of Allegorithmic or any third party.
+3.2 You shall not:
+(i) Provide, disclose, display or otherwise make available the Software or any copy, portion, extract or derivative thereof, or permit use of any of the foregoing by or for the benefit of multiple users or any third party, including, without limitation, by uploading the Software to a network or file-sharing service time-sharing, or subscription service basis, on a hosting, cloud, service-bureau, or for carrying out any third party administrative, outsourcing, or other services),
+(ii) Do anything that could cause or result in the Software being subject to any open source license (or similar license) that requires as a condition of use, modification or distribution of the Software including the run-time portion thereof; and specifically that would entail the Software to be:
+(A) disclosed or distributed in source code form,
+(B) licensed for the purpose of making derivative works, or
+(C) redistributable at no charge, nor
+(iii) Use the Software or Copyrighted Assets:
+(A) either to unfairly compete with any Allegorithmic proprietary software;
+(B) or for any research, development and commercialization of texturing and/or material authoring products, assets, services or technologies, based on or deriving from machine learning, including deep learning, and/or other artificial intelligence techniques.
+4. USE OF THE SOFTWARE
+4.1 Software License Terms
+Subject to the terms and conditions of the Agreement including the applicable Specific Terms and Conditions for a particular Software, and Your compliance therewith including Your payment of all Fees payable if any, Allegorithmic grants You, for the Term of this Agreement, a limited, non-exclusive, personal, non-transferable, non-sublicensable, non-divisible, revocable License, solely to install and execute the executable form of the Software as specified in 4.2, solely for Your internal Use by a single User, for the purpose of developing Your Licensee Content.
+The License for the Software grants You the right to get access to the Documentation specific to the Software You are licensing.
+Allegorithmic commits to deliver the Software within two (2) working days after Your order payment.
+The Software shall be provided to You in object code. In no event, shall the source code of the Software be made available to You.
+Except if You hold an Evaluation License, the License gives You the right to create Your own assets and Licensee Content. Whilst You are not allowed under the License to redistribute the Software, You are authorized to redistribute Your Licensee Content.
+Allegorithmic may display Your logo on Allegorithmic Substance users’ website pages, unless You notified Allegorithmic in writing not to do so.
+4.2 One License per User
+Each User of the Software must hold one (1) valid License of the Software. Except if You hold an Evaluation License, the License may be installed on two (2) different computers by the User, provided that these computers belong to you, that such copy shall constitute “Software” for all purposes of this Agreement and that You shall not be allowed to Use both copies simultaneously.
+4.3 Floating License
+If Your License is Floating, You may install such Software on as many computers as needed for Use by any authorized User provided that there is one (1) license per concurrent individual User.
+4.4 Using previous versions
+Previous versions of the Software may be used upon request to Allegorithmic.
+Contact Allegorithmic at contact@allegorithmic.com for more information.
+5. GENERAL RESTRICTIONS APPLICABLE TO COPYRIGHTED ASSETS
+With respect to Copyrighted Assets and except as expressly permitted under the Agreement:
+5.1 You shall not, and shall not assist, enable or otherwise permit or allow any third party to:
+•	decompile, disassemble or otherwise reverse engineer or attempt to derive the source code of (unless expressly permitted under applicable law) or any technical data, know-how, trade secrets, processes, techniques, specifications, protocols, methods, algorithms, interfaces, ideas, solutions, structures or other information embedded or used in Copyrighted Assets,
+•	rent, lend, loan, lease, sell, encumber, distribute, sublicense, or otherwise permit use of or access to Copyrighted Asset by third parties,
+•	remove, alter, or obscure any proprietary or restrictive notices affixed to or contained in Copyrighted Assets,
+•	circumvent or attempt to circumvent any technological protective measure contained in or supported by Copyrighted Asset; or any copy, portion, extract or derivative thereof,
+•	Use the Copyrighted Asset in any manner that violates any applicable law or regulation whether local, national or international,
+•	Use the Copyrighted Asset in any manner that violates any Intellectual Property Rights or privacy rights of Allegorithmic or any third party.
+5.2 You shall not:
+(i) provide, disclose, display or otherwise make available the Copyrighted Asset or any copy, portion, extract or derivative thereof, or permit use of any of the foregoing by or for the benefit of multiple users or any third party, including, without limitation, by uploading the Software to a network or file-sharing service time-sharing, or subscription service basis, on a hosting, cloud, service-bureau, or for carrying out any third party administrative, outsourcing, or other services,
+(ii) do anything that could cause or result in the Software being subject to any open source license (or similar license) that requires as a condition of use, modification or distribution of the Software including the run-time portion thereof; and specifically that would entail the Software to be:
+(A) disclosed or distributed in source code form,
+(B) licensed for the purpose of making derivative works, or
+(C) redistributable at no charge; and
+(iii) use the Software to develop a competing service, solution or software.
+6. USE OF COPYRIGHTS WORK
+6.1 Subject to this Agreement including the Specific Terms and Conditions for Copyrighted Assets applicable to You, and Your compliance therewith including Your payment of all Fees payable if any, Allegorithmic or the Third-Party Provider as the case might be, grants You, for the Term of this Agreement, a limited, non-exclusive, personal, non-transferable, non-sublicenseable, revocable License, to Use a Copyrighted Asset and to access its Documentation, if available.
+6.2 Notwithstanding anything contrary in the foregoing Section 5 and Section 2.3 of the Specific Terms of Use of Substance Source, the License for Copyrighted Asset gives You the right to store, display, modify the Copyrighted Asset and create Licensee Content. You may redistribute Your Licensee Content and are entitled under the License to make any Commercial Use of Your Licensee Content (that is, as long as they constitute the primary value of the Licensee Content). For the avoidance of doubt, You shall not redistribute the Copyrighted Asset independently of Your Licensee Content. The Copyrighted Asset may only be redistributed by You if such Copyrighted Asset is an integrated component of your Licensee Content.
+7. INTELLECTUAL PROPERTY RIGHTS IN THE SOFTWARE AND COPYRIGHTED ASSETS
+7.1 You acknowledge and agree that the Software and/or Copyrighted Assets are licensed to You only and in no event can the Software or the Copyrighted Assets be considered as being sold to You.
+7.2 You acknowledge and agree that Allegorithmic (or their licensors or other third party as applicable) own and shall retain all rights, titles and interests in and to the Software and the Copyrighted Assets (including without limitation any copies, portions, extracts or derivatives thereof, and any developments, modifications or enhancements thereto) including all Intellectual Property Rights.
+7.3 Further, if You provide to Allegorithmic any comments, suggestions, submissions, and other feedback (whether oral, in writing, or in electronic or any other form) with respect to the Software or the Allegorithmic Copyrighted Asset (together “Feedback”), You hereby irrevocably agree to grant Allegorithmic all the Intellectual Property Rights in such Feedback.
+7.4 You acknowledge and agree that (i) the Software and the Allegorithmic Copyrighted Assets are original in whole and in any element thereof, alone or combined, including algorithms, interfaces, functionality, screen design, and other elements thereof, and (ii) based on the Berne Convention for the Protection of Literary and Artistic Works as well as the French Intellectual Property Code, and other applicable Intellectual Property Rights laws and treaties, Allegorithmic is the owner of the Software and the Allegorithmic Copyrighted Assets.
+7.5 You agree that You will not delete or in any manner alter any Allegorithmic or third-party copyright, trademark or other proprietary notices appearing on or in the Software or the Copyrighted Asset.
+8. FEES AND TAXES
+Where applicable, You agree to pay all amounts due for the Software or the Copyrighted Assets as set forth in the applicable Specific Terms and Conditions, online stores, quote and/or invoice. All Fees payable under this Agreement are net amounts and are payable in full, without deduction for taxes or duties of any kind. You will be responsible for, and will promptly pay all taxes including but not limited to sales, use and withholding taxes associated with this Agreement and/or Your receipt or Use of the Software or the Copyrighted Asset, except for taxes based on Allegorithmic’s net income, if any. In the event that Allegorithmic is required to collect any tax for which You are responsible, You will pay such tax directly to Allegorithmic. If You pay any withholding taxes that are required to be paid under applicable law, You will promptly provide Allegorithmic with written evidence from tax authorities of the payment of such taxes.
+For professional customers, no discount is applied for prior payment. Late payment is subject to penalties equal to 10% of the sums due, payable from the day following the invoice payment period. A fixed compensation fee for collection costs of forty (40) euros is owed in addition without further formality from the first day of late payment.
+For EEA customers, your bank may require you to authenticate your initial purchase using a password, a one-time code sent to your mobile number, or biometric recognition. When you authenticate, you also authorize us to charge your payment method for additional purchases without providing us further payment information or other instructions (i.e. we will initiate future payments independently). Such additional purchases may occur when we automatically charge your payment method in connection with a recurring subscription or when you add or change licenses or products.
+9. MODIFICATION OF THE GENERAL TERMS AND CONDITIONS OR THE SPECIFIC TERMS AND CONDITIONS
+Allegorithmic may revise the General Terms and Conditions and the Specific Terms and Conditions (the “Terms” for the purpose of this Section 9) at any time for legal, best practice or any other reason.
+Allegorithmic will not use this right to make substantial changes to the Terms to Your detriment without giving You a chance to agree.
+If You do not agree to the changes made to the Terms, You may terminate any License. You are expected to check for revisions to the Terms regularly as they are binding on You. Any subsequent Use by You of any Software or Copyrighted Assets after a change in the Terms shall imply that You accepted the revised Terms.
+10. CONSENT TO DATA COLLECTION
+The Software may connect to the Internet and report information about your Use back to Allegorithmic.
+Allegorithmic is processing data for the following purposes:
+•	check for Software updates;
+•	provide aggregated usage statistics of Your Use of the Software and the Use of the Copyrighted Asset or Your Licensee Content and enhance your Use experience;
+•	validate or block license keys in order to prevent unauthorized Use, if applicable;
+Allegorithmic implements data processing only if, at least, one of the following conditions is met:
+•	Your consent to the processing operations has been obtained;
+•	the existence of Allegorithmic legitimate interest, or that of a third party, which justifies that Allegorithmic implements this processing of personal data;
+•	the execution of a contract binding Allegorithmic to You requires that Allegorithmic implements this processing of personal data;
+Allegorithmic is subject to statutory and regulatory obligations which require this processing of personal data.
+The personal data Allegorithmic collects, and those Allegorithmic obtained subsequently, are intended for Allegorithmic in its capacity as data controller.
+Allegorithmic ensures that only authorised persons have access to these data. Allegorithmic’s service providers can be recipients of these data to perform the services Allegorithmic entrusts to them. Some personal data may be sent to affiliated companies, third parties or to legally authorised authorities in order to meet Allegorithmic legal, regulatory or contractual obligations or for internal management purposes.
+They may be communicated to these entities for the purposes referred to in this clause. These operations are carried out on the basis of instruments that comply with applicable regulations and are capable of ensuring that Your rights are protected and respected.
+The data processed are intended for the authorized persons of the firm, as well as its providers.
+Allegorithmic may transfer Your personal data to partners in the United States of America. Transfers made to the United States of American are covered either by the Privacy Shield or by standard contractual clauses approved by the European Commission.
+The periods for which Allegorithmic keeps Your personal data are proportionate to the purposes for which Your data were collected.
+In accordance with the French Data Protection Act and the General Data Protection Regulation, individuals have the right to access to their personal data, the right to rectify, inquire about their personal data, the right to restriction of processing, and as well as the right to erasure in respect of those data.
+Data subjects also have the right to object, on grounds relating to their particular situation, at any time to processing of personal data which have as their legal basis the legitimate interest of the firm, as well as the right to object to processing for direct marketing purposes.
+They also have the right to give general or specific instructions on how the above rights should be exercised after their death. You can exercise the above-mentioned rights by sending a letter, together with a copy of a signed identity document by email at privacy@allegorithmic.com or legal@allegorithmic.com or by mail to “Allegorithmic, 3 avenue Julien 63000 Clermont Ferrand”. For further information on this topis, You can also read our Privacy Policy and Cookie Policy available on substance3D.com/legal/.
+11. ASSISTANCE
+In the event You have a query about the Software or a Copyrighted Asset, You may contact Allegorithmic support team by email at the address provided on Allegorithmic website.
+12. TERM AND TERMINATION
+12.1 Right of withdrawal
+As previously provided in the foreword of this Agreement, if You are consumer or non-professional, You understand and agree that by downloading any Software or Copyrighted Asset immediately after accepting this Agreement, You are hereby losing your withdrawal right.
+12.2 Duration of the Agreement
+All Evaluation License for the Evaluation Software shall be effective for a period of thirty (30) days from the date You downloaded the Evaluation Software, unless otherwise agreed expressly between Allegorithmic and You.
+Unless expressly and specifically provided otherwise in the applicable Specific Terms and Conditions, all subscription Licenses which are subject to the payment of recurring Licenses Fees shall be effective from the date You downloaded the Software or the Copyrighted Asset, and will stay in force as long as You are current with the payment of the License Fees.
+Unless expressly and specifically provided otherwise in applicable Specific Terms and Conditions, all paid-in full Licenses for any Software or Copyrighted assets granted under the Agreement shall be effective for the duration of the applicable legal copyright protection, unless earlier terminated in accordance with the Agreement.
+12.3 Tacit renewal
+Unless expressly and specifically provided otherwise, when You subscribe to a Substance License, a tacit renewal applies. Thus, the Software is licensed to You under a tacitly renewable monthly or yearly subscription program which allows You to access the latest available releases, if applicable, as long as You are current with the payment of the License Fees as set out in the Commercial Terms.
+12.4 Termination of the Agreement
+Unless expressly and specifically provided otherwise, You can cancel your Substance License at any time without cancellation fees by using the cancel payment option on Your Allegorithmic Account. In such a case, You shall not be able to Use any of the Software included in Substance after the expiry of Your current Substance License term, whether monthly or yearly.
+Please notice that if you cancel the Agreement after paying the License Fees, no refund will be possible.
+12.5 Breach of the Agreement
+In the event You breach this Agreement including if You fail to pay the Fees where applicable, this Agreement shall automatically terminate in its own right and Allegorithmic shall be under no obligation to provide a prior notice thereof.
+12.6 Consequences of Termination
+Upon termination of the Agreement, You shall, at Allegorithmic’s option, either promptly delete and destroy, or return to Allegorithmic all copies of the Software in Your possession or control. Allegorithmic may also disable the Software upon the expiration of any License.
+All provisions in connection with the Intellectual Property Rights in the Software or the Copyrighted asset shall survive the termination of this Agreement.
+13. NO WARRANTY
+THE SOFTWARE AND THE COPYRIGHTED ASSET ARE PROVIDED TO YOU “AS IS”, WITHOUT WARRANTY OF ANY KIND, TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW. ALLEGORITHMIC AND ITS LICENSORS DISCLAIM ALL WARRANTIES AND CONDITIONS, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT, AND ANY WARRANTIES AND CONDITIONS ARISING OUT OF COURSE OF DEALING OR USAGE OF TRADE, INCLUDING USE OR COMBINATION OF THE SOFTWARE WITH THIRD-PARTY APPLICATIONS. ALLEGORITHMIC FURTHER DOES NOT WARRANT THAT THE SOFTWARE OR THE COPYRIGHTED ASSETS WILL ALWAYS FUNCTION UNINTERRUPTED OR ERROR-FREE. IF YOU ARE LICENSING COPYRIGHTED ASSETS FROM A THIRD-PARTY PROVIDER, ALLEGORITHMIC SHALL HAVE NO LIABILITY WHATSOEVER TOWARDS YOU INCLUDING WITHOUT LIMITATION LIABILITY FOR INFRINGEMENT OF ANY THIRD PARTY’S INTELLECTUAL PROPERTY RIGHTS BY THE THIRD-PARTY PROVIDER, IRRESPECTIVE OF THE FACT THAT PAYMENTS HAVE BEEN MADE TO ALLEGORITHMIC. NO ADVICE OR INFORMATION, WHETHER ORAL OR WRITTEN, OBTAINED FROM ALLEGORITHMIC OR ELSEWHERE WILL CREATE ANY WARRANTY OR CONDITION NOT EXPRESSLY STATED IN THIS AGREEMENT.
+14. LIMITATION OF LIABILITY
+ALLEGORITHMIC AND ITS LICENSORS’ TOTAL LIABILITY TO YOU ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT REGARDLESS OF THE CAUSE OF ACTION, WHETHER BASED ON WARRANTY, CONTRACT, TORT (INCLUDING NEGLIGENCE OR STRICT PRODUCT LIABILITY), INDEMNITY, OR OTHERWISE AND WHETHER OR NOT ALLEGORITHMIC OR ITS LICENSORS HAVE BEEN ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH LOSS OR DAMAGE AND EVEN IF SUCH DAMAGES WERE FORESEEABLE WILL BE LIMITED TO THE GREATER OF THE AMOUNTS PAID BY YOU FOR THE SOFTWARE OR THE COPYRIGHTED ASSET OR ONE HUNDRED U.S. DOLLARS (US$100). IN NO EVENT SHALL ALLEGORITHMIC OR ITS LICENSORS BE LIABLE TO YOU FOR ANY SPECIAL, INCIDENTAL, EXEMPLARY, PUNITIVE OR CONSEQUENTIAL DAMAGES (INCLUDING LOSS OF DATA, BUSINESS, PROFITS OR ABILITY TO EXECUTE) OR FOR THE COST OF PROCURING SUBSTITUTE PRODUCTS ARISING OUT OF OR IN CONNECTION WITH THIS AGREEMENT OR THE EXECUTION OR PERFORMANCE OF THE SOFTWARE OR THE COPYRIGHTED ASSET, WHETHER SUCH LIABILITY ARISES FROM ANY CLAIM BASED UPON CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE. THE FOREGOING LIMITATIONS WILL SURVIVE AND APPLY TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, EVEN IF ANY LIMITED REMEDY SPECIFIED IN THIS AGREEMENT IS FOUND TO HAVE FAILED OF ITS ESSENTIAL PURPOSE. YOU AGREE TO DEFEND, HOLD HARMLESS AND INDEMNIFY ALLEGORITHMIC, AND ITS SUBSIDIARIES, AFFILIATES, AGENTS, EMPLOYEES, AND SUPPLIERS, FROM AND AGAINST ANY THIRD PARTY CLAIM ARISING FROM OR IN ANY WAY RELATED TO YOUR OU YOUR USERS’S USE OF THE SOFTWARE OR VIOLATION OF THESE TERMS, INCLUDING ANY LIABILITY OR EXPENSES ARISING FROM ALL CLAIMS, LOSSES, DAMAGES (ACTUAL AND CONSEQUENTIAL), SUITS, JUDGEMENTS, LITIGATION COSTS AND REASONABLE ATTORNEY’S FEES
+15. CONFIDENTIALITY
+15.1 The Software and Allegorithmic Copyrighted Assets and any copies, portions, extracts and derivatives thereof (including the source code of, or any technical data, know-how, trade secrets, processes, techniques, specifications, protocols, methods, algorithms, interfaces, ideas, solutions, structures, technical architecture or other information embedded or used in any of the foregoing) and any other non-public information and technology disclosed by Allegorithmic to You in connection with this Agreement constitutes the confidential information of Allegorithmic (the “Allegorithmic Confidential Information”). You shall hold the Allegorithmic Confidential Information in strict confidence and shall not disclose it to any third party except to Your designees who need to have access to it and who are bound in writing by confidentiality obligations at least as protective of the Allegorithmic Confidential Information as those contained herein. You shall not use the Allegorithmic Confidential Information for any purpose other than as necessary for Your Use of the Software as expressly authorized in this Agreement. You shall exercise the same care that You exercise to protect Your own confidential and proprietary information of similar importance.
+15.2 In the event Allegorithmic receives confidential information from You, Allegorithmic undertakes to hold Your confidential information in strict confidence and not to use Your confidential information, except in connection with (i) the performance of this Agreement or (ii) Your Use of the Software. In addition, when providing Your confidential information to Allegorithmic, you shall mark all Your confidential information as “confidential” or “proprietary”.
+15.3 The obligations of each party set forth above shall not apply to confidential information to the extent that the receiving party can prove that it:
+•	was already in its possession without confidentiality or use restrictions prior to its disclosure by or on behalf of the disclosing Party; or
+•	is subsequently disclosed to the receiving party without any confidentiality or use restrictions by a third party; or
+•	is in the public domain or subsequently comes into the public domain through no act or omission of the receiving Party or its agents or employees; or
+•	is required by law or a valid order by a court or other government body, provided, however, that the receiving Party promptly informs the disclosing Party in writing upon becoming aware of the relevant legal requirements.
+16. EXPORT LAW
+You agree to fully comply with all applicable export laws and regulations to ensure that neither the Software nor any technical data related thereto are exported or re-exported directly or indirectly in violation of,or Used for any purposes prohibited by such laws and regulations.
+17. AUDIT RIGHT
+Upon Allegorithmic reasonable prior written notice to You, You shall permit Allegorithmic or its designees to audit from time to time Your Use of the Software or the Copyrighted Assets. You shall provide reasonable assistance to Allegorithmic or its designees in the event such audit is conducted.
+18. GOVERNING LAW AND JURISDICTION
+18.1 Governing law. This Agreement shall be governed by and construed in accordance with the laws of France, without regard to or application of conflict of laws rules or principles. The United Nations convention on contracts for the international sale of goods shall not apply.
+18.2 Jurisdiction. French courts of competent jurisdiction shall have exclusive jurisdiction over any dispute arising out of or in connection with this Agreement, including any dispute regarding the existence, validity or termination thereof, to the extent permitted by applicable law.
+19. GENERAL
+19.1 You understand and agree that money damages alone might not be an adequate remedy and as such Allegorithmic shall have the right to seek injunctive relief in any court of competent jurisdiction.
+19.2 You may not assign or transfer this Agreement or any rights granted hereunder, by operation of law or otherwise, without Allegorithmic’s prior written consent, and any attempt by You to do so, without such consent, will be void.
+19.3 Except as expressly set forth in this Agreement, the exercise by either party of any of its remedies under this Agreement will be without prejudice to its other remedies under this Agreement or otherwise.
+19.4 All notices required or permitted under this Agreement shall be in writing. All notices to You might be either in the form of an electronic mail or by registered mail with acknowledgement of receipt. All notices to Allegorithmic shall be sent by registered mail with acknowledgement of receipt to Allegorithmic’s registered office or otherwise to the address set forth in the applicable ordering document or invoice or to such other address as may be specified by Allegorithmic.
+19.5 Each party may enforce its respective rights under the Agreement even if it has waived the right or failed to enforce the same or other rights in the past. Any waiver, modification or amendment of any provision of this Agreement will be effective only if in writing and signed by authorized representatives of both parties.
+19.6 If any provision of this Agreement is held to be unenforceable or invalid, that provision will be enforced to the maximum extent possible and the other provisions will remain in full force and effect.
+19.7 This Agreement is the complete and exclusive understanding and agreement between the parties regarding its subject matter, and supersedes all proposals, understandings or communications between the parties, oral or written, regarding its subject matter, unless You and Allegorithmic have executed a separate agreement governing Your Use of the Software or the Copyrighted Assets.
+19.8 Translations. The English language version of this Agreement is legally binding in the event of any conflict between the English version and any translations.
+19.9 Any terms or conditions contained in Your purchase order or other ordering document that are inconsistent with or in addition to the terms and conditions of this Agreement are hereby rejected by Allegorithmic and will be deemed null.
+20. EXCEPTIONS FOR CONSUMER USERS
+20.1 If You are a Consumer and You acquire the Software or the Copyrighted Asset, for your direct individual Use and do not make any direct or indirect Commercial Use of the Software or the Copyrighted Asset then be advised that certain Sections of these General Terms and Conditions shall not be applicable to You i.e. Section 13 (No warranty), Section 14 (Limitation of liability), Section 18.2 (Jurisdiction), Section 19.8 (Translations).
+20.2 Right of Withdrawal. If You downloaded a specific Software or Copyrighted Asset after accepting the applicable Specific Terms and Conditions, You shall not be entitled to Your withdrawal right under applicable law provided that the right of withdrawal available to Consumers which may be exercised by You within fourteen (14) days from the date of conclusion of the contract, does not apply to contracts for the supply of digital content if:
+(i) the digital content is not provided on a tangible medium, and
+(ii) the contract performance started through the act of downloading by the Consumer, with the consumer’s prior express consent and the consumer’s acknowledgment that s/he lost his/her withdrawal right.
+Therefore, You hereby understand and agree that by downloading the Software or the Copyrighted Asset and being granted instantaneous access to such digital content, You have lost Your withdrawal right.
+20.3 Mediation. If a dispute arises between You and Allegorithmic, please be aware that as a Consumer, you have a right to seek a recourse with a mediator, free of charge, in order to reach a settlement agreement with Allegorithmic. For Your information, Allegorithmic’s designated mediator is the ” Federation du e-commerce et de la vente a distance ” (FEVAD) and the e-commerce mediation service (60, rue la Boetie – 75008 Paris, France, relationconso@fevad.com).
+20.4 Allegorithmic is a French limited liability company with a share capital of 189 080 euros, whose registered office is at 3 avenue Julien, 63000 Clermont-Ferrand, France, registered under number 448 617 753 with the Registry of Commerce and Companies of Clermont-Ferrand, with VAT registration number FR91385385844.
+The contact email address is contact@allegorithmic.com or sales@allegorithmic.com.
+ 
+SUBSTANCE – SPECIFIC TERMS & CONDITIONS AND TERMS OF USE
+Last updated – March 6, 2019
+By subscribing to Substance, which is Allegorithmic annual or monthly subscription plan, You will be provided with a bundle comprised of the latest available releases of selected Allegorithmic Software products including/
+(i) Substance Painter,
+(ii) Substance Designer,
+(iii) Substance B2M,
+(iv) Substance Automation Toolkit for the Indie license,
+(v) Substance Alchemist, and
+(vi) a fixed number of Substance Source assets’ downloads per subscription month, depending on your License (hereinafter “Substance”).
+Your Use of Substance is subject to:
+(i) the Substance Painter Specific Terms and Conditions,
+(ii) the Substance Designer Specific Terms and Conditions,
+(iii) the Substance B2M Specific Terms and Conditions,
+(iv) the Substance Automation Toolkit Specific Terms and Conditions if applicable,
+(v) the Substance Source Terms of Use, all appended hereto,
+(vi) the Substance Alchemist Terms and Conditions and (vi) the General Terms and Conditions.
+BY DOWNLOADING, INSTALLING, COPYING, ACCESSING OR OTHERWISE USING SUBSTANCE, YOU AGREE TO BE BOUND BY THE TERMS OF THIS AGREEMENT.
+1. ADDITIONAL DEFINITIONS
+“Software” means either (i) Substance Painter, or (ii) Substance Designer or (iii) Substance B2M, or (iv) Substance Automation Toolkit or (v) Substance Source or (vi) Substance Alchemist or (vii) Substance Launcher.
+“Substance” or “Substance toolset” means a bundle subscription plan comprised of the latest available releases of selected Allegorithmic Software products including (i) Substance Painter, (ii) Substance Designer, (iii) Substance B2M (iv) Substance Automation Toolkit (for Indie License only), (iv) Substance Alchemist and (v) an access to Substance Source with limited download capacity of a fixed number of Substance Source assets per subscription month, depending on your License.
+“Substance – Indie License” means the Indie License granted hereunder for Use of Substance subscription plan.
+“Substance – Pro License” means the Pro License granted hereunder for Use of Substance subscription plan.
+“Substance – Enterprise License” means the Enterprise License granted hereunder for Use of Substance subscription plan.
+2. SPECIFIC TERMS AND CONDITIONS
+DEPENDING ON THE TYPE OF LICENSE GRANTED TO YOU, DIFFERENT RIGHTS AND RESTRICTIONS WILL APPLY.
+PLEASE READ THE FOLLOWING SECTION CAREFULLY.
+2.1 COMMERCIAL TERMS FOR SUBSTANCE
+As provided in Section 12 Term and Termination of the General Terms and Conditions, Substance is only licensed to You under a tacitly renewable monthly or yearly subscription program. It allows You to access the latest available releases of (i) Substance Painter, (ii) Substance Designer (iii) Substance B2M and (iv) Substance Automation Toolkit if applicable as long as you are current with the payment of the License Fees as set out in the Commercial Terms. Substance also allows you to download up to a fixed number of Copyrighted Assets of Substance Source per month and per year depending on your License.
+As provided in Section 12 Term and Termination of the General Terms and Conditions, You can cancel your Substance License at any time without cancellation fees by using the Cancel payment option on your Allegorithmic Account. In such case, You shall not be able to Use any of the Software included in Substance after the expiry of your current Substance License term, whether monthly or yearly. Upon termination of Your Substance License, Allegorithmic shall disable all Software in Your possession. Further, You shall, at Allegorithmic’s option, either promptly delete and destroy, or return to Allegorithmic all copies of the Software in Your possession or control.
+Your Allegorithmic Account is personal to You or Your organization, and is non-transferable. Each Allegorithmic Account may be associated with one or several individuals, depending on your License.
+2.2 RIGHTS & USE RESTRICTIONS ON SOFTWARE AND APPLICABLE FEES
+Restriction for Legal Entity Using Substance Indie License
+If You are accepting the terms of this Agreement on behalf of a Legal Entity for Use of the Software with a Substance – Indie License, You represent and warrant to Allegorithmic that You are a Legal Entity with Revenue or annual budget not exceeding USD 100,000 and as such You are entitled to Use an Indie License (as this term is defined in the General terms and Conditions). If You are a Legal Entity using a Substance – Indie License, You are not permitted to combine or integrate in any manner any Licensee Content developed under a Substance Indie License with Licensee Content developed simultaneously with a Substance – Pro License or Substance – Enterprise License.
+Restriction and option for all Users of Substance – Indie License
+If You are an authorized User under a Substance – Indie License, You may commence a project using only a Substance – Indie License and subsequently upgrade all (but not less than all) of Your Substance – Indie License to a Substance – Pro license by contacting Allegorithmic.
+Option to acquire a definitive License for Substance – Indie Licensees:
+Should you wish to terminate your Substance – Indie License, You may be granted the right, at Your option, to a perpetual license of any version build number of the Software in force as of the day of Your Substance non-renewal or termination, without further maintenance, for the entire legal duration of the applicable copyright laws on any Software included in Substance.
+PLEASE NOTE, that the above option can only be exercised upon the following cumulative conditions:
+Prior continuous subscription of twelve (12) months to Substance – Indie and;
+Payment of a fixed residual fee as set out in the Commercial Terms on Allegorithmic website, in force as of the termination date.
+This option is not available for Substance – Pro or Substance – Enterprise Licensees.
+Additional maintenance may be subscribed on Allegorithmic website or by contacting sales@allegorithmic.com. Maintenance Service provides most recent Software or Substance Source updates. Maintenance fees are due and payable annually in advance of a maintenance period (“Maintenance Period”), defined as a renewable twelve (12) months period beginning twelve (12) months after the beginning of the Term. If maintenance is subscribed after the end of the current Term, late renewal fees may be charged as per the then-applicable price list.
+All the aforementioned License Fees are subject to change at Allegorithmic’s sole discretion. Such change shall be notified to You in accordance with the General Terms and Conditions.
+Restriction for Legal Entity Using Substance – Pro License or Substance – Enterprise License
+If You are a Legal Entity with Revenue or annual budget exceeding USD 100,000, Allegorithmic is unwilling to grant You a Substance – Indie License to You, and You must destroy all copies of the Software in Your possession or control and You must purchase separately a Substance – Pro or a Substance – Enterprise License, as applicable, and agree to the terms of such Substance – Pro or Substance – Enterprise License including the payment of fees as set forth in Section 2.A above. In addition, Use of a fixed number of downloaded Substance Source assets per subscription month, depending on your License, is limited to a single site per Substance subscription.
+The User is also to refer to the following conditions:
+Substance Designer Specific T&Cs
+Substance Painter Specific T&Cs
+Substance B2M Specific T&Cs
+Substance Automation Toolkit T&C
+Substance Source Terms of Use
+Substance Alchemist Specific T&Cs
+Substance Launcher Specific T&Cs
+ 
+SUBSTANCE PLAYER – SPECIFIC TERMS & CONDITIONS
+Last Updated – June 18, 2017
+The software You are licensing hereunder is Substance Player (“the Software”).
+1. DEFINITIONS
+“Substance Player” means the Software licensed to You by Allegorithmic that allows You to display or render media effects.
+2. SPECIFIC TERMS AND CONDITIONS
+Substance Player is provided to You as is, with some Substance files for Substance Player and/or other media elements. You may use, copy, reproduce and distribute the included Substances files only for personal, educational and Non-Commercial Use.
+Allegorithmic shall retain all Intellectual Property Rights, including without limitation copyrights to all media elements provided to You with the Software.
+ 
+SUBSTANCE DESIGNER – SPECIFIC TERMS & CONDITIONS
+Last updated – June 18, 2017
+The software You are licensing hereunder is Substance Designer (“the Software”).
+In addition to the General Terms and Conditions, Your Use of the Software is subject to the following additional terms and conditions.
+DEPENDING ON THE TYPE OF LICENSE GRANTED TO YOU, DIFFERENT RIGHTS AND RESTRICTIONS WILL APPLY TO YOU.
+PLEASE READ THE FOLLOWING SECTION CAREFULLY.
+1. ADDITIONAL DEFINITIONS
+“Substance Designer” means Software.
+“Substance Designer Indie License” means the Indie License granted hereunder for the Software
+“Substance Designer Pro License” means the Pro License granted hereunder for the Software
+2. SPECIFIC TERMS AND CONDITIONS
+2.1 ONE USER PER LICENSE
+Each User of Substance Designer whether a Legal Entity or an individual person must hold one (1) valid License of the Software either Indie, Pro, Enterprise, Student, Academic or Evaluation Substance Designer License.
+2.2 SPECIFIC USE RESTRICTIONS
+Restriction for Legal Entity Using Substance Designer Indie License
+If You are accepting the terms of this Agreement on behalf of a Legal Entity for Use of the Software with a Substance Designer Indie License, You represent and warrant to Allegorithmic that You are a Legal Entity with Revenue or annual budget not exceeding USD 100,000 and as such You are entitled to Use an Indie License (as this term is defined in the General terms and Conditions).
+If You are a Legal Entity using Substance Designer Indie License, You are not permitted to combine or integrate in any manner any Licensee Content developed under a Substance Designer Indie License with any Licensee Content developed simultaneously under a Substance Designer Pro License.
+Restriction for Legal Entity Using Substance Designer Pro License
+If You are a Legal Entity with Revenue or annual budget exceeding USD 100,000, Allegorithmic is unwilling to license Substance Designer Indie to You, and You must destroy all copies of Substance Designer Indie in Your possession or control and You must purchase separately a Substance Designer Pro License and agree to the terms of such Substance Designer Pro License including the payment of Fees as set forth in the applicable Commercial Terms.
+2.3 RESTRICTION ON USE OF SUBSTANCE DESIGNER IF YOU USE SUBSTANCE
+If Your right to Use Substance Designer is part of Your License to Substance and is subject to the payment of subscription License Fees which are payable monthly or otherwise, You are entitled to use the last executable version of the Software as long as You are either (i) up to thirty (30) days, or up to the end of the current term if agreed otherwise, after Your last Substance subscription monthly payment, as duly performed (ii) current with Your maintenance program subscription payment, as duly performed.
+ 
+SUBSTANCE PAINTER – SPECIFIC TERMS & CONDITIONS
+Last updated – June 18, 2017
+The software You are licensing hereunder is Substance Painter (“the Software”).
+In addition to the General Terms and Conditions, Your Use of the Software is subject to the following additional terms and conditions.
+DEPENDING ON THE TYPE OF LICENSE GRANTED TO YOU, DIFFERENT RIGHTS AND RESTRICTIONS WILL APPLY TO YOU.
+PLEASE READ THE FOLLOWING SECTION CAREFULLY.
+1. ADDITIONAL DEFINITIONS
+“Substance Painter” means Software.
+“Substance Painter Indie License” means the Indie License granted hereunder for the Software
+“Substance Painter Pro License” means the Pro License granted hereunder for the Software
+2. SPECIFIC TERMS AND CONDITIONS
+2.1 ONE USER PER LICENSE
+Each User of Substance Painter whether a Legal Entity or an individual person must hold one (1) valid License of the Software either Indie, Pro, Enterprise, Student, Academic or Evaluation Substance Painter License.
+2.2 SPECIFIC USE RESTRICTIONS
+Restriction for Legal Entity Using Substance Painter Indie License
+If You are accepting the terms of this Agreement on behalf of a Legal Entity for Use of the Software with a Substance Painter Indie License, You represent and warrant to Allegorithmic that You are a Legal Entity with Revenue or annual budget not exceeding USD 100,000 and as such You are entitled to Use an Indie License (as this term is defined in the General terms and Conditions).
+If You are a Legal Entity using Substance Painter Indie License You are not permitted to combine or integrate in any manner any Licensee Content developed under a Substance Painter Indie License with any Licensee Content developed simultaneously under a Substance Painter Pro License.
+Restriction for Legal Entity Using Substance Painter Pro License
+If You are a Legal Entity with annual gross Revenue or annual budget exceeding USD 100,000, Allegorithmic is unwilling to license Substance Painter Indie to You, and You must destroy all copies of Substance Painter Indie in Your possession or control and You must purchase separately a Substance Painter Pro License and agree to the terms of such Substance Painter Pro License including the payment of Fees as set forth in the applicable Commercial Terms.
+2.3 RESTRICTION ON USE OF SUBSTANCE PAINTER IF YOU USE SUBSTANCE
+If Your right to Use Substance Painter is part of Your License to Substance and is subject to the payment of subscription License Fees which are payable monthly or otherwise, You are entitled to use the last executable version of the Software as long as You are either (i) up to thirty (30) days, or up to the end of the current term if agreed otherwise, after Your last Substance subscription monthly payment, as duly performed (ii) current with Your maintenance program subscription payment, as duly performed.
+ 
+SUBSTANCE B2M – SPECIFIC TERMS & CONDITIONS
+Last updated – June 15, 2017
+The software You are licensing hereunder is Bitmap2Material (the “Software”).
+In addition to the General Terms and Conditions, Your Use of the Software is subject to the following additional terms and conditions.
+DEPENDING ON THE TYPE OF LICENSE GRANTED TO YOU, DIFFERENT RIGHTS AND RESTRICTIONS WILL APPLY TO YOU.
+PLEASE READ THE FOLLOWING SECTION CAREFULLY.
+1. ADDITIONAL DEFINITIONS
+“Substance B2M” or “B2M” means Software.
+“Substance B2M Indie License” means the Indie license granted for the software
+“Substance B2M Pro License” means the Pro license granted for the software
+2. SPECIFIC TERMS AND CONDITIONS
+2.1 ONE USER PER LICENSE
+Each User of Substance B2M whether a Legal Entity or an individual person must hold one (1) valid License of the Software, either Indie, Pro, Enterprise, Student, Academic or Evaluation Substance B2M License.
+2.2 SPECIFIC USE RESTRICTIONS
+Restriction for Legal Entity Using Substance B2M Indie License
+If You are accepting the terms of this Agreement on behalf of a Legal Entity for Use of the Software with a Substance B2M Indie License, You represent and warrant to Allegorithmic that You are a Legal Entity with Revenue or annual budget not exceeding USD 100,000 and as such You are entitled to Use an Indie License (as this term is defined in the General terms and Conditions)..
+If You are a Legal Entity using Substance B2M Indie License You are not permitted to combine or integrate in any manner any Licensee Content developed under a Substance B2M Indie License with any Licensee Content developed simultaneously under a Substance B2M Pro License.
+Restriction for Legal Entity Using Substance B2M Pro License
+If You are a Legal Entity with Revenue or annual budget exceeding USD 100,000, Allegorithmic is unwilling to license Substance B2M Indie to You, and You must destroy all copies of Substance B2M Indie in Your possession or control and You must purchase separately a Substance B2M Pro License and agree to the terms of such Substance B2M Pro License including the payment of Fees as set forth in the applicable Commercial Terms.
+2.3 RESTRICTION ON USE OF BITMAP2MATERIAL IF YOU USE SUBSTANCE
+If Your right to Use Substance B2M is part of Your License to Substance and is subject to the payment of subscription License Fees which are payable monthly or otherwise, You are entitled to use the last executable version of the Software as long as You are either (i) up to thirty (30) days, or up to the end of the current term if agreed otherwise, after Your last Substance subscription monthly payment, as duly performed (ii) current with Your maintenance program subscription payment, as duly performed.
+ 
+SUBSTANCE AUTOMATION TOOLKIT – SPECIFIC TERMS & CONDITIONS
+Last updated – July 17, 2018
+The development tools You are licensing hereunder are Substance Automation Toolkit (“Automation Toolkit”).
+In addition to the General Terms and Conditions and the Specific Terms and Conditions for Substance Designer if applicable, Your Use of Automation Toolkit is subject to the following additional terms and conditions.
+DEPENDING ON THE TYPE OF LICENSE GRANTED TO YOU, DIFFERENT RIGHTS AND RESTRICTIONS WILL APPLY TO YOU.
+PLEASE READ THE FOLLOWING SECTION CAREFULLY.
+1. ADDITIONAL DEFINITIONS
+“Substance Automation Toolkit” or “Automation Toolkit” means development tools known as Automation Toolkit, Substance BatchTools or Pysbs, either commonly or independently licensed to the User, Substance Designer SDK as well as any documentation and services provided in regard thereto. Substance Automation Toolkit software includes a set of utilities destined to automate processes in your texturing pipelines.
+“Documentation” means documentation and information that Allegorithmic provides regarding the use of Automation Toolkit through Allegorithmic websites.
+2. SPECIFIC TERMS AND CONDITIONS
+2.1 LICENSE CATEGORIES
+Each User of Automation Toolkit, whether a Legal Entity or an individual person must subscribe to either: one (1) valid Substance Designer Indie License or have a valid subscription to Substance Indie License, on a per-user basis; or one (1) Substance Automation Toolkit license designed for Pro and Enterprise licensees on a per Technical User basis, as defined in the Permitted use section below.
+Substance Automation Toolkit may be packaged with Substance Engine SDK upon prior agreement with Allegorithmic, on a case-by-case basis.
+2.2 SPECIFIC USE CONDITIONS
+Permitted use
+Substance Automation Toolkit are provided to help You streamline your creation process of texture rendering.
+Allegorithmic grants you a limited, non-exclusive, non-transferable, non-divisible and revocable license to use the Substance Automation Toolkit. In addition thereto, please note that Pro and Enterprise licenses for Substance Automation Toolkit are 12-months renewable licenses.
+Substance Automation Toolkit is licensed on a per technical User basis, which shall be construed as the User authoring and writing tools to automate the Licensee texturing pipeline process (the “Technical User”). Each Technical User of the Legal Entity shall have a valid Substance Automation Toolkit License to author tools that can be run by multiple users for purposes of developing Licensee content on a per location basis, unless otherwise agreed with Allegorithmic.
+Allegorithmic reserves the right to limit, or temporarily or indefinitely suspend your access to the Substance Automation Toolkit, should the aforesaid conditions be infringed.
+Allegorithmic owns all rights, title, and interest, including all intellectual property rights, in and to, the Substance Automation Toolkit and all elements, data and components thereof; Allegorithmic services; and Allegorithmic brands and materials. Except for the licenses granted in these terms, Allegorithmic does neither grant you any right, title, or interest in the Automation Toolkit, nor acquire any ownership in your application.
+If you are under the Pro or Enterprise license, You must have a valid agreement in force with Allegorithmic to use the Substance Automation Toolkit in a production environment.
+If you are under the Pro or Enterprise license, unless there is a separate valid agreement between You and Allegorithmic for the Automation Toolkit, You may use such Automation Toolkit exclusively for evaluation and testing purpose, any other purpose being prohibited.
+Restrictions on use
+You may not use the Automation Toolkit or any other technology in a manner that accesses or uses any information beyond what Allegorithmic allows under this section or the Documentation, that changes the Automation Toolkit, that breaks or circumvents any of Allegorithmic’s technical process or security measures, that disrupts or degrades the performance of Allegorithmic Software.
+You may neither sell, rent, lease, sublicense, redistribute, or syndicate access to Automation Toolkit, nor alter or remove any Allegorithmic brands elements or legal notices contained in, or appearing on Automation Toolkit.
+You may not reverse-engineer Substance Automation Toolkit or generally any part of the Substance Automation Toolkit, or any portion thereof, or distribute or transmit any malware, viruses or other computer programming that may damage or detrimentally interfere with any system or data, to the extent permitted by applicable law. You represent and warrant that Your application does not and shall not contain any “viral open source code”, the present obligation being of the essence for Allegorithmic.
+To the extent that any part of the Substance Automation Toolkit includes source code, Allegorithmic may make such part of the Substance Automation Toolkit subject to additional restrictions during the course of the license.
+You understand that abiding by the present Section 2 is of the essence for the performance of this Agreement. In consideration thereto, You agree that violation of Section 2 shall automatically terminate Your license to use the Automation Toolkit, without further notice.
+3. FEEDBACKS AND ENHANCEMENTS
+Allegorithmic shall own, and You shall not have any right, title or interest in, any enhancements or other modifications to the Software or the Automation Toolkit based on any suggestions, enhancement requests, recommendations or other feedback provided by You to Allegorithmic, either directly or through any communication or development platform, to the extent permitted by applicable law.
+4. WARRANTY AND LIABILITY
+Notwithstanding anything to the contrary herein, Substance Automation Toolkit and its components are provided “as is” without indemnity or warranty of any kind, whether express, implied, statutory, or otherwise. Allegorithmic shall bear no liability of any kind for any direct, indirect, incidental, punitive, special or consequential damages resulting from use, misuse (or attempted use) of the Automation Toolkit and has no obligation to provide support to You, unless expressly licensed otherwise and to the extent permitted by applicable law.
+You agree to defend, hold harmless and indemnify Allegorithmic, and its subsidiaries, affiliates, agents, employees, and suppliers, from and against any third party claim arising from or in any way related to your or your users’ use of the Automation Toolkit or violation of these terms of use, including any liability or expenses arising from all claims, losses, damages (actual and consequential), suits, judgments, litigation costs and reasonable attorneys’ and litigation fees.
+ 
+TERMS OF USE OF SUBSTANCE SOURCE
+Last updated: March 6, 2019
+PLEASE READ THESE TERMS OF USE CAREFULLY BEFORE USING THIS WEBSITE OR DOWNLOADING OR USING ANY COPYRIGHTED ASSET FROM SUBSTANCE SOURCE.
+Substance Source is a library of Copyrighted Assets owned and operated by Allegorithmic (“Allegorithmic”), a limited liability company with its registered office at 3 avenue Julien 63000 Clermont-Ferrand, France.
+Substance Source can be either purchased on Allegorithmic website (https://www.substance3d.com), used through the Substance Source Website or via integration: Substance Painter and third-party applications which have received Allegorithmic written consent to do it so.
+The Substance Source Website is owned and operated by Allegorithmic.
+Each of the assets provided in Substance Source are subject to Copyrighted Assets Terms.
+In these Terms of Use, capitalized terms shall have the meaning ascribed to them in the General Terms and Conditions unless defined elsewhere in these Terms of Use.
+The Copyrighted Assets including any updates enhancements and new features are subject to these Terms of Use (“Terms of Use”). These Terms of Use constitute a legally binding agreement between You and Allegorithmic.
+By using this Website, purchasing Substance Source – Pro License or Enterprise License, or by downloading Copyrighted Assets from Substance Source, You accept and agree to these Terms of Use, General Terms and Conditions and any applicable terms and conditions policies or disclaimers that may be found on Allegorithmic and Substance Source websites or Substance Source partner websites.
+1. GENERAL TERMS OF USE OF SUBSTANCE SOURCE
+By accessing or using Substance Source You warrant and undertake to Allegorithmic that You have the legal right to use Substance Source and download and use Copyrighted Assets.
+1.1 Definition
+Library Asset: means a Copyrighted Asset that Allegorihmic distributes through Substance Source
+1.2 Download of Copyrighted Assets
+You may use Substance Source to download Copyrighted Assets distributed by Allegorithmic. The Copyrighted Assets shall be licensed to You by Allegorithmic.
+For Substance – Indie and Substance -Pro Licensees, Allegorithmic provides an online platform allowing to download Copyrighted Assets.
+For Substance Source – Pro and Substance Source – Enterprise licensees, Substance Source is provided via a .zip file to be downloaded on main Allegorithmic website, at https://www.substance3d.com. Substance Source – Pro and Substance Source – Enterprise licensees may also use the online platform mentioned above.
+You understand and agree that Allegorithmic is not responsible for any problem that may happen in the use of Copyrighted Assets.
+1.3 Number of downloads
+If you subscribe to Substance as Indie or Pro, you are authorized to download up to a fixed number of Copyrighted Assets per month, as defined on Allegorithmic website.
+1.4 Maintenance Service
+Substance Source maintenance service (“Maintenance Service”) is included in the first Term (12-months) period of the Substance Source – Pro site License and the Substance Source – Enterprise site License, and then offered on an optional basis.
+Maintenance Service provides most recent Substance Source content updates. The scope of Maintenance Services will be automatically extended accordingly, for the Maintenance Service customer to be provided with the most recent released content version of Substance Source. Maintenance Service shall not include delivery of additional modules, which may be ordered at the list price as part of a separate agreement.
+The annual maintenance fees are fifty (50) per cent of the current list price (“Maintenance Fees”) of Substance Source. Maintenance Fees are due and payable annually in advance of a Maintenance Period. If not subscribed before the end of the current Term, late renewal fees may be applicable as per the applicable price list. Payment of Maintenance Fees must be continuous, without lapse of coverage. Maintenance Fees shall be adjusted yearly as per Substance Source list price. All Maintenance Service ordered for a Maintenance Period shall be non-cancelable and non-refundable. You may terminate the Maintenance Service by written notice, including e-mail, sent prior to the renewal date. No partial termination of Maintenance Service shall be admissible.
+The present section shall not apply to Substance toolset monthly subscriptions.
+2. YOUR USE OF SUBSTANCE SOURCE
+2.1 No unlawful use of Substance Source
+You agree to use Substance Source only for purposes that are permitted by the terms of these Terms of Use or any applicable law or regulation. You agree to comply with all applicable local laws and regulations regarding the download and Use of Copyrighted Assets. In particular, You warrant that You shall not do anything with Substance Source which is unlawful or could be considered without limitation to be offensive, racist, sexist, libelous, threatening, obscene, defamatory, disparaging, be critical of or derogatory of Allegorithmic Third-Party Providers or other third-parties or infringing on third party rights including unregistered rights image rights or Confidential Information.
+2.2 No prohibited use of Substance Source
+Except if You have been expressly permitted to do so by Allegorithmic under a separate written agreement, You agree that You will not reproduce, alter, modify, duplicate, copy, sell or trade any or all of the Substance Source Website for any purpose.
+2.3. No competition with Library Assets
+You cannot redistribute your Licensee Content if it is based on a Library Asset and is not different enough from any initial Library Asset you used to create your Licensee Content, whether the similarity is based on the design or features of the Library Asset This restriction is aimed at preventing any willful intent to deceive or confuse customers of Allegorithmic Copyrighted Assets.
+Notwithstanding anything contrary in the Section 5 of the General Terms and Conditions, You may redistribute Your Licensee Content based on a similar Library Asset if it is an integrated component of your Licensee Content.
+2.4 Member Account Password and Security
+If Substance Source requires You to open an account, You must complete the registration process by providing Allegorithmic with current complete and accurate information as prompted by the applicable registration form.
+You also will choose a password and a user name which are personal. You are responsible for keeping your account information and password confidential and are responsible for all activity that occurs under Your account.
+You agree to notify Allegorithmic without delay of any unauthorized use of Your account or any other breach of security that You detect or suspect on Your account.
+2.5 Accessing Substance Source
+You agree not to access or attempt to access Substance Source by any means other than through the interface that is provided by Allegorithmic unless You have been expressly allowed otherwise to do so by Allegorithmic in a separate written agreement. You specifically agree not to access or attempt to access Substance Source through any automated means.
+You agree that You will not engage in any activity that interferes with or disrupts (i) Substance Source including its servers or connected networks or (ii) the Copyrighted Assets.
+You agree that You are solely and fully responsible for Your own Use of Substance Source and Copyrighted Assets You downloaded and any breach of Your obligations or contravention under these Terms of Use or the Specific Terms and Conditions for Substance Source or under any applicable laws or regulations and for all the consequences of such breach or contravention including without limitation, losses or damages of any kind which Allegorithmic may suffer from your breach or contravention. You understand and agree that in no event shall Allegorithmic be liable to You or any other third party for any such breach or contravention.
+3. OWNERSHIP RIGHTS OF COPYRIGHTED ASSETS
+If You download Copyrighted Assets, You understand and agree that Allegorithmic owns all rights, title and interest in Copyrighted Assets available through Substance Source.
+You understand that Copyrighted Assets are licensed to You and not sold to You.
+You understand that you cannot distribute, sell or license any of the Copyrighted Assets.
+4. INDEMNIFICATIONS FOR YOUR USE OF SUBSTANCE SOURCE
+To the maximum extent permitted by law, You agree to defend indemnify and hold harmless Allegorithmic, its affiliates and their respective directors officers employees and agents from and against any and all claims, actions, suits or proceedings as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising directly or indirectly out of Your Use of Substance Source including the use of the Source Website and the Downloading and Use of any Copyrighted Assets.
+5. TERMINATION
+5.1 These Terms will continue to apply until terminated by either You or Allegorithmic as set out below.
+5.2 If You want to terminate these Terms of Use You may do so by ceasing Your use of Substance Source and any Copyrighted Assets downloaded by You from Substance Source.
+5.3 Allegorithmic may at any time terminate these Terms of Use if: (A) You have breached any provision of these Terms of Use; or (B) Allegorithmic is required to do so by law or a court order; or (C) Allegorithmic decides to close or no longer provide access to Substance Source.
+5.4 Upon termination of these Terms of Use for any reason and except for the terms of the Terms of Use which are meant to survive termination of the Terms of Use including without limitation Section 4 (Indemnifications for Your Use of Substance Source and Section 7 (Limitation of liability), all of legal rights obligations and liabilities that You and Allegorithmic were subject to, shall terminate. The termination of these Terms of Use shall have no impact on the Copyrighted Assets downloaded by You prior to termination, except if these Terms of Use have been terminated by Allegorithmic for a breach of Your obligations.
+6. DISCLAIMER OF WARRANTIES
+6.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF SUBSTANCE SOURCE AND ANY COPYRIGHTED ASSETS DOWNLOADED OR OTHERWISE OBTAINED USING SUBSTANCE SOURCE IS AT YOUR SOLE RISK AND THAT SUBSTANCE SOURCE AND THE COPYRIGHTED ASSETS ARE PROVIDED “AS IS” WITHOUT WARRANTY OF ANY KIND TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW. IN PARTICULAR, ALLEGORITHMIC, ITS SUBSIDIARIES, HOLDING COMPANIES, AFFILIATES AND ITS LICENSORS DO NOT REPRESENT OR WARRANT TO YOU THAT (A) YOUR USE OF SUBSTANCE SOURCE OR THE COPYRIGHTED ASSETS WILL MEET YOUR REQUIREMENTS (B) YOUR USE OF SUBSTANCE SOURCE OR THE COPYRIGHTED ASSETS WILL BE UNINTERRUPTED TIMELY SECURE OR FREE FROM ERROR (C) ANY INFORMATION OBTAINED BY YOU AS A RESULT OF YOUR USE OF SUBSTANCE SOURCE OR COPYRIGHTED ASSETS WILL BE ACCURATE OR RELIABLE (D) THAT DEFECTS IN THE OPERATION OR FUNCTIONALITY OF ANY SOFTWARE OR APPLICATION MADE AVAILABLE TO YOU ON SUBSTANCE SOURCE WILL BE CORRECTED AND (E) SUBSTANCE SOURCE OR THE COPYRIGHTED ASSETS WILL NOT CAUSE ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA.
+6.2 TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, ALLEGORITHMIC FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES, TERMS OR CONDITIONS OF ANY KIND WHETHER EXPRESS OR IMPLIED INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES, TERMS AND CONDITIONS OF MERCHANTABILITY, SATISFACTORY, QUALITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT WITH RESPECT TO SUBSTANCE SOURCE OR ANY COPYRIGHTED ASSETS DOWNLOADED OR OTHERWISE OBTAINED THROUGH SUBSTANCE SOURCE.
+7. LIMITATION OF LIABILITY
+ALLEGORITHMIC’S AND ITS LICENSORS’ TOTAL LIABILITY TO YOU ARISING UNDER OR IN CONNECTION WITH THESE TERMS OF USE REGARDLESS OF THE CAUSE OF ACTION WHETHER BASED ON WARRANTY CONTRACT TORT (INCLUDING NEGLIGENCE OR STRICT PRODUCT LIABILITY), INDEMNITY OR OTHERWISE AND WHETHER OR NOT ALLEGORITHMIC OR ITS LICENSORS HAVE BEEN ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH LOSS OR DAMAGE AND EVEN IF SUCH DAMAGES WERE FORESEEABLE WILL BE LIMITED TO THE GREATER OF THE AMOUNTS PAID BY YOU FOR THE COPYRIGHTED ASSET THAT DIRECTLY CAUSED YOUR PROVEN DAMAGES OR ONE HUNDRED U.S. DOLLARS (US$100). IN NO EVENT, SHALL ALLEGORITHMIC OR ITS LICENSORS BE LIABLE TO YOU FOR ANY SPECIAL, INCIDENTAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING LOSS OF DATA BUSINESS PROFITS OR ABILITY TO EXECUTE) OR FOR THE COST OF PROCURING SUBSTITUTE PRODUCTS ARISING OUT OF OR IN CONNECTION WITH THESE TERMS OF USE OR THE EXECUTION OR PERFORMANCE OF THE COPYRIGHTED ASSETS WHETHER SUCH LIABILITY ARISES FROM ANY CLAIM BASED UPON CONTRACT TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE. THE FOREGOING LIMITATIONS WILL SURVIVE AND APPLY EVEN IF ANY LIMITED REMEDY SPECIFIED IN THESE TERMS OF USE ARE FOUND TO HAVE FAILED OF ITS ESSENTIAL PURPOSE. IF APPLICABLE LAW LIMITS THE APPLICATION OF THE PROVISIONS OF THIS SECTION 7, ALLEGORITHMIC AND ITS LICENSOR’S LIABILITY WILL BE LIMITED TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW.
+8. CHANGE OF TERMS
+Allegorithmic may revise the terms of these Terms of Use and the Agreement at any time for legal best practice or any other reason. Allegorithmic will not use this right to make substantial changes to the Terms of Use to Your detriment without giving You a chance to agree. Allegorithmic will inform You in advance of any substantial revision of the Terms of Use by sending an email to You. Before Your visit, Allegorithmic may have changed the Terms of Use. Please be sure to review the current Terms of Use each time You visit Substance Source and intend as new Terms of Use may be applicable.
+9. GOVERNING LAW AND JURISDICTION
+9.1 GOVERNING LAW. THESE TERMS OF USE SHALL BE GOVERNED BY AND CONSTRUED IN ACCORDANCE WITH THE LAWS OF FRANCE WITHOUT REGARD TO OR APPLICATION OF CONFLICT OF LAWS RULES OR PRINCIPLES. THE UNITED NATIONS CONVENTION ON CONTRACTS FOR THE INTERNATIONAL SALE OF GOODS SHALL NOT APPLY.
+9.2 JURISDICTION. FRENCH COURTS OF COMPETENT JURISDICTION SHALL HAVE EXCLUSIVE JURISDICTION OVER ANY DISPUTE ARISING OUT OF OR IN CONNECTION WITH THESE TERMS OF USE INCLUDING ANY DISPUTE REGARDING THE EXISTENCE, VALIDITY OR TERMINATION THEREOF TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+10. GENERAL
+10.1 You understand and agree that money damages alone might not be an adequate remedy to Allegorithmic in case of breach of these Terms of Use and as such Allegorithmic shall have the right to seek injunctive relief in any court of competent jurisdiction.
+10.2 You may not assign or transfer these Terms of Use or any rights granted hereunder by operation of law or otherwise without Allegorithmic’s prior written express consent and any attempt by You to do so without such express consent will be void.
+10.3 Except as expressly set forth in these Terms of Use the exercise by either party of any of its remedies under these Terms of Use will be without prejudice to its other remedies under these Terms of Use or otherwise.
+10.4 All notices required or permitted under these Terms of Use shall be in writing. All notices to You might be either in the form of an electronic mail or by registered mail with acknowledgement of receipt. All notices to Allegorithmic shall be sent by registered mail with acknowledgement of receipt to Allegorithmic’s registered office or otherwise to such other address as may be specified by Allegorithmic.
+10.5 Each party may enforce its respective rights under these Terms of Use even if it has waived the right or failed to enforce the same or other rights in the past. Any waiver, modification or amendment of any provision of these Terms of Use will be effective only if in writing and duly authorized by representatives of the parties.
+10.6 If any provision of these Terms of Use is held to be unenforceable or invalid that provision will be enforced to the maximum extent possible and the other provisions will remain in full force and effect.
+10.7 The terms and conditions set forth in these Terms of Use shall govern the entire agreement between You and Allegorithmic relating to Allegorithmic’s provision of and Your Use of Substance Source and Copyrighted Assets and shall apply to the exclusion of any terms and conditions which are contained in referenced in or accompanying any purchase order or other document record or communication issued or otherwise transmitted by a Party whether in written electronic or any other form (together the “Documents”) unless such Documents were expressly agreed prior in writing by Allegorithmic.
+Furthermore, the terms and conditions of these Terms of Use shall prevail over any additional or conflicting terms or conditions which are contained in any “shrink-wrap” or “click-through” agreements with any software used in connection with Substance Source or the Copyrighted Asset.
+10.8 These Terms of Use are the complete and exclusive understanding and agreement between the parties regarding its subject matter and supersedes all proposals understandings or communications between the parties oral or written regarding its subject matter unless You and Allegorithmic have executed a separate written agreement governing Your Use of Substance Source or Copyrighted Assets.
+10.9 Translations. The English language version of these Terms of Use is legally binding in the event of any conflict between the English version and any translations.
+ 
+SUBSTANCE ALCHEMIST – SPECIFIC TERMS & CONDITIONS
+Last updated – April 17, 2019
+The software You are licensing hereunder is Substance Alchemist (&quot;the Software&quot;).
+In addition to the General Terms and Conditions, Your Use of the Software is subject to the
+following additional terms and conditions.
+DEPENDING ON THE TYPE OF LICENSE GRANTED TO YOU, DIFFERENT RIGHTS AND
+RESTRICTIONS WILL APPLY TO YOU.
+PLEASE READ THE FOLLOWING SECTION CAREFULLY.
+1. ADDITIONAL DEFINITIONS
+“Substance Alchemist” means Software.
+“Substance Alchemist Pro License” means the Pro License granted hereunder for the
+Software
+“Substance Alchemist Enterprise License” means the Enterprise License granted hereunder
+for the Software
+2. SPECIFIC TERMS AND CONDITIONS – ONE USER PER LICENSE
+Each User of Substance Alchemist whether a Legal Entity or an individual person must hold
+one (1) valid License of the Software either Pro, Enterprise, Student, Academic or Evaluation Substance Alchemist License.
+3. RESTRICTION ON USE OF SUBSTANCE ALCHEMIST IF YOU USE SUBSTANCE
+If Your right to Use Substance Alchemist is part of Your License to Substance subscription
+and is subject to the payment of subscription License Fees which are payable monthly or otherwise, You are entitled to use the last executable version of the Software as long as You are either (i) up to thirty (30) days, or up to the end of the current term if agreed otherwise, after Your last Substance subscription monthly payment, as duly performed (ii) current with Your maintenance program subscription payment, as duly performed.
+4. DISCLAIMER OF WARRANTY
+PLEASE NOTE THAT THE ALCHEMIST VERSION PROVIDED ON THE WEBSITE IS A BETA VERSION OF ALCHEMIST SOFWARE. AS SUCH, IT IS STILL UNDERGOING TESTING BEFORE ITS FINAL RELEASE AND PROVISIONS OF SECTIONS 13 – NO WARRANTY AND 14 – LIMITATION OF LIABILITY OF THE GENERAL TERMS AND CONDITIONS, SHALL APPLY.
+NOTWITHSTANDING ANYTHING TO THE CONTRARY HEREIN, IN PARTICULAR, ALLEGORITHMIC, ITS SUBSIDIARIES, HOLDING COMPANIES, AFFILIATES AND ITS LICENSORS DO NOT REPRESENT OR WARRANT TO YOU THAT (A) YOUR USE OF SUBSTANCE ALCHEMIST WILL MEET YOUR REQUIREMENTS (B) YOUR USE OF SUBSTANCE ALCHEMIST WILL BE UNINTERRUPTED TIMELY SECURE OR FREE FROM ERROR (C) THAT DEFECTS IN THE OPERATION OR FUNCTIONALITY OF ANY SOFTWARE OR APPLICATION MADE AVAILABLE TO YOU ON SUBSTANCE ALCHEMIST WILL BE CORRECTED AND (D) SUBSTANCE ALCHEMIST WILL NOT CAUSE ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA.
+YOU AGREE TO DEFEND, HOLD HARMLESS AND INDEMNIFY ALLEGORITHMIC, AND ITS SUBSIDIARIES, AFFILIATES, AGENTS, EMPLOYEES, AND SUPPLIERS, FROM AND AGAINST ANY THIRD PARTY CLAIM ARISING FROM OR IN ANY WAY RELATED TO YOUR OR YOUR USERS’ USE OF SUBSTANCE ALCHEMIST OR VIOLATION OF THESE TERMS OF USE, INCLUDING ANY LIABILITY OR EXPENSES ARISING FROM ALL CLAIMS, LOSSES, DAMAGES (ACTUAL AND CONSEQUENTIAL), SUITS, JUDGMENTS, LITIGATION COSTS AND REASONABLE ATTORNEYS’ AND LITIGATION FEES.
+ 
+SUBSTANCE LAUNCHER – SPECIFIC TERMS & CONDITIONS
+Last update – March 6, 2019
+In addition to the General Terms and Conditions, Your Use of the Substance Launcher is subject to the following additional terms and conditions.
+The software You are licensing hereunder is Substance Launcher (the “Software”)
+1. ADDITIONAL DEFINITION
+“Substance Launcher” means the software developed by Allegorithmic with which You can access to the Substance toolset specified in the different Specific Terms & Conditions. The Substance Launcher is part of the proprietary software of Allegorithmic.
+2. SPECIFIC TERMS AND CONDITIONS
+The Software is licensed to You free of charge by downloading it on Allegorithmic website. Therefore, the terms related to the monthly or annual subscriptions do not apply to the Substance Launcher. The Section 12 – Termination of General Terms and Conditions does not apply either. Allegorithmic shall retain all Intellectual Property Rights, including without limitation copyrights to all media elements provided to You with the Software, including without limitation the Substance Toolset you may access with the Software.
diff --git a/Assets/Allegorithmic/Plugins/EULA.txt.meta b/Assets/Allegorithmic/Plugins/EULA.txt.meta
new file mode 100644
index 000000000..a9f185b8b
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/EULA.txt.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 621b2d5ea7ccae24db255abafe8d423d
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance.EditorHelper.meta b/Assets/Allegorithmic/Plugins/Substance.EditorHelper.meta
new file mode 100644
index 000000000..3c4997ad6
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.EditorHelper.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a4f7fbb2ac2da364ab1dc7b4d3e7fa34
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance.EditorHelper/Scripter.cs b/Assets/Allegorithmic/Plugins/Substance.EditorHelper/Scripter.cs
new file mode 100644
index 000000000..43067187a
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.EditorHelper/Scripter.cs
@@ -0,0 +1,68 @@
+
+using System;
+using UnityEditor;
+using UnityEngine;
+using System.Runtime.InteropServices;
+
+using System.IO;
+using System.Reflection;
+using System.Collections.Generic;
+
+namespace Substance.EditorHelper
+{
+    public class Scripter
+    {
+        public static void Hello()
+        {
+            Debug.Log("Scripter's Hello");
+
+#if UNITY_2019_3_OR_NEWER
+            Debug.Log("UNITY_2019_3_OR_NEWER");
+#endif
+        }
+
+        public static class UnityPipeline
+        {
+            // The active project context is in the 'Edit->Project Settings->Graphics->Scriptable Render Pipeline Settings' field.
+            public static bool IsHDRP()
+            {
+#if UNITY_2019_3_OR_NEWER
+            bool bActive = false;
+
+            UnityEngine.Rendering.RenderPipelineAsset asset;
+            asset = UnityEngine.Rendering.GraphicsSettings.renderPipelineAsset;
+
+            if ((asset != null) &&
+                (asset.GetType().ToString().EndsWith(".HDRenderPipelineAsset")))
+            {
+                    bActive = true;
+            }
+
+            return bActive;
+#else
+                return false;
+#endif
+            }
+
+            public static bool IsURP()
+            {
+#if UNITY_2019_3_OR_NEWER
+            bool bActive = false;
+
+            UnityEngine.Rendering.RenderPipelineAsset asset;
+            asset = UnityEngine.Rendering.GraphicsSettings.renderPipelineAsset;
+
+            if ((asset != null) &&
+                (asset.GetType().ToString().EndsWith(".UniversalRenderPipelineAsset")))
+            {
+                bActive = true;
+            }
+
+            return bActive;
+#else
+                return false;
+#endif
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/ColonyTab.cs.meta b/Assets/Allegorithmic/Plugins/Substance.EditorHelper/Scripter.cs.meta
similarity index 83%
rename from Assets/Scripts/UI/ColonyTab.cs.meta
rename to Assets/Allegorithmic/Plugins/Substance.EditorHelper/Scripter.cs.meta
index 0f3ed6dd9..efaea7bdf 100644
--- a/Assets/Scripts/UI/ColonyTab.cs.meta
+++ b/Assets/Allegorithmic/Plugins/Substance.EditorHelper/Scripter.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 69422316520cbd649ad89629be288c06
+guid: d89b80f4b24cce644b8e52d3616d167d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/Allegorithmic/Plugins/Substance.EditorHelper/Substance.EditorHelper.asmdef b/Assets/Allegorithmic/Plugins/Substance.EditorHelper/Substance.EditorHelper.asmdef
new file mode 100644
index 000000000..4a4ffe10e
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.EditorHelper/Substance.EditorHelper.asmdef
@@ -0,0 +1,3 @@
+{
+	"name": "Substance.EditorHelper"
+}
diff --git a/Assets/Allegorithmic/Plugins/Substance.EditorHelper/Substance.EditorHelper.asmdef.meta b/Assets/Allegorithmic/Plugins/Substance.EditorHelper/Substance.EditorHelper.asmdef.meta
new file mode 100644
index 000000000..4bd10c953
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.EditorHelper/Substance.EditorHelper.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a46b712d5dad9df4d93e9725ef567b93
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance.Engine.bundle.meta b/Assets/Allegorithmic/Plugins/Substance.Engine.bundle.meta
new file mode 100644
index 000000000..b07e37d71
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.Engine.bundle.meta
@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 32ccb4a722ae62b438353357177d72c8
+folderAsset: yes
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents.meta b/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents.meta
new file mode 100644
index 000000000..a3dad3d7b
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b02191648317c46439d56b9bf04c25e3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/Info.plist b/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/Info.plist
new file mode 100644
index 000000000..74b873a72
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/Info.plist
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>17G65</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>Substance.Engine</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string></string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string></string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>10A255</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>18A384</string>
+	<key>DTSDKName</key>
+	<string>macosx10.14</string>
+	<key>DTXcode</key>
+	<string>1000</string>
+	<key>DTXcodeBuild</key>
+	<string>10A255</string>
+	<key>NSHumanReadableCopyright</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/Info.plist.meta b/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/Info.plist.meta
new file mode 100644
index 000000000..58ab455ca
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/Info.plist.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f8395c312e4e82547bc5f917302a86c5
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/MacOS.meta b/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/MacOS.meta
new file mode 100644
index 000000000..fd7aef2bb
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/MacOS.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 109989c16fe541046863b512b5458546
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/MacOS/Substance.Engine b/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/MacOS/Substance.Engine
new file mode 100644
index 000000000..b19826bc0
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/MacOS/Substance.Engine
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e939231365b3cb5f6c72c4427e65e7aff2377bda2c03569aad22fe453a0ac339
+size 1050128
diff --git a/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/MacOS/Substance.Engine.meta b/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/MacOS/Substance.Engine.meta
new file mode 100644
index 000000000..d6c3ee940
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/MacOS/Substance.Engine.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 391b4624b07b8e64f92205761ca3d10a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance.Engine.dll b/Assets/Allegorithmic/Plugins/Substance.Engine.dll
new file mode 100644
index 000000000..676be0536
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.Engine.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:609686faf066e4c8e80da581f33ede7071d5a87795bddc4349cfbfdb8fd88abc
+size 825344
diff --git a/Assets/Allegorithmic/Plugins/Substance.Engine.dll.meta b/Assets/Allegorithmic/Plugins/Substance.Engine.dll.meta
new file mode 100644
index 000000000..08f7284ef
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.Engine.dll.meta
@@ -0,0 +1,27 @@
+fileFormatVersion: 2
+guid: 7130e6ee9baa4c44188636490f76e992
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance.Game.dll b/Assets/Allegorithmic/Plugins/Substance.Game.dll
new file mode 100644
index 000000000..fcbec129b
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.Game.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c32195156b9944c18dca3daacd12e94c51cf08745ea9c2dd4060ca5a9ad03238
+size 55808
diff --git a/Assets/Allegorithmic/Plugins/Substance.Game.dll.meta b/Assets/Allegorithmic/Plugins/Substance.Game.dll.meta
new file mode 100644
index 000000000..4bcf335be
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.Game.dll.meta
@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 16ea688720e474944a4e808112b45ba4
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance.Platform.meta b/Assets/Allegorithmic/Plugins/Substance.Platform.meta
new file mode 100644
index 000000000..a098e485b
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.Platform.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e33d2a21bdda74e47ad11e147182be88
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance.Platform/NativeFunctions.cs b/Assets/Allegorithmic/Plugins/Substance.Platform/NativeFunctions.cs
new file mode 100644
index 000000000..45ad4da24
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.Platform/NativeFunctions.cs
@@ -0,0 +1,1159 @@
+#if (!UNITY_EDITOR && UNITY_ANDROID)
+#define IMPORT_STATIC
+#elif (!UNITY_EDITOR && UNITY_IOS)
+#define IMPORT_STATIC
+#else
+#define IMPORT_DYNAMIC // Make this an "#else" so that, by default, the corresponding script code (below) is enabled!
+#endif
+
+using System;
+using UnityEngine;
+using System.Runtime.InteropServices;
+
+using System.IO;
+using System.Reflection;
+using System.Collections.Generic;
+
+namespace Substance.Platform
+{
+    public class NativeFunctions
+    {
+        // ToDo: move "build target" function out of here, they have nothing to do with "native functions".
+        public enum BuildTarget
+        {
+            Default = 0, // or: Editor
+            StandAlone,
+            IOS,
+            Android
+        }
+
+
+        public static BuildTarget GetBuildTarget()
+        {
+            // Use Unity's environment variables:
+            BuildTarget buildTarget = BuildTarget.Default;
+
+#if (UNITY_STANDALONE)
+            buildTarget = BuildTarget.StandAlone;
+#elif (UNITY_IOS)
+            buildTarget = BuildTarget.IOS;
+#elif (UNITY_ANDROID)
+            buildTarget = BuildTarget.Android;
+#endif
+
+            return buildTarget;
+        }
+
+        public static string GetBuildTargetString()
+        {
+            // Use Unity's environment variables:
+            string buildTarget = "UNKNOWN";
+
+#if (UNITY_STANDALONE)
+            buildTarget = "StandAlone";
+#elif (UNITY_IOS)
+            buildTarget = "IOS";
+#elif (UNITY_ANDROID)
+            buildTarget = "Android";
+#endif
+
+            return buildTarget;
+        }
+
+        public static bool IsMobile()
+        {
+            bool bMobile = false;
+
+#if (UNITY_IOS || UNITY_ANDROID)
+            bMobile = true;
+#endif
+
+            return bMobile;
+        }
+
+        public static TextureFormat GetMobileTextureFormat()
+        {
+            TextureFormat format = TextureFormat.RGBA32;
+
+#if (UNITY_IOS)
+            format = TextureFormat.PVRTC_RGBA4;
+#elif (UNITY_ANDROID)
+            format = TextureFormat.ETC2_RGBA8;
+#else
+            Debug.LogError("The current build target is NOT for a modbile platform!");
+#endif
+            return format;
+        }
+
+#if DEBUG
+        public static void ShowBuildTargetEnvironment() // dev/debug tool
+        {
+#if (UNITY_EDITOR)
+            Debug.Log("UNITY_EDITOR");
+#endif
+#if (UNITY_EDITOR_WIN)
+            Debug.Log("UNITY_EDITOR_WIN");
+#endif
+#if (UNITY_EDITOR_OSX)
+            Debug.Log("UNITY_EDITOR_OSX");
+#endif
+#if (UNITY_STANDALONE_OSX)
+            Debug.Log("UNITY_STANDALONE_OSX");
+#endif
+#if (UNITY_STANDALONE_WIN)
+            Debug.Log("UNITY_STANDALONE_WIN");
+#endif
+#if (UNITY_STANDALONE_LINUX)
+            Debug.Log("UNITY_STANDALONE_LINUX");
+#endif
+#if (UNITY_STANDALONE)
+            Debug.Log("UNITY_STANDALONE");
+#endif
+#if (UNITY_IOS)
+            Debug.Log("UNITY_IOS");
+#endif
+#if (UNITY_IPHONE)
+            Debug.Log("UNITY_IPHONE");
+#endif
+#if (ENABLE_MONO)
+            Debug.Log("ENABLE_MONO");
+#endif
+#if (UNITY_ANDROID)
+            Debug.Log("UNITY_ANDROID");
+#endif
+#if (ENABLE_IL2CPP)
+            Debug.Log("ENABLE_IL2CPP");
+#endif
+        }
+#endif // DEBUG
+
+        // ========================================================================================
+
+        // STATIC IMPORT UTILITIES:
+        // Define DllImport's attribute value here:
+#if (UNITY_IOS)
+        public const string attributeValue = "__Internal";
+#elif (UNITY_ANDROID)
+        public const string attributeValue = "Substance.Engine.Mobile";
+#else
+        public const string attributeValue = "UnknownAttributeValue";
+#endif
+
+        // ======================================================================
+        // DYNAMIC IMPORT UTILITIES:
+#if IMPORT_DYNAMIC
+        internal class DLLHelpers
+        {
+            [DllImport("kernel32.dll", EntryPoint = "LoadLibrary", SetLastError = true, CharSet = CharSet.Unicode)]
+            protected static extern IntPtr LoadLibrary(string filename);
+
+            [DllImport("kernel32.dll", EntryPoint = "GetProcAddress", SetLastError = true)]
+            protected static extern IntPtr GetProcAddress(IntPtr hModule, string procname);
+
+            [DllImport("kernel32.dll", SetLastError = true)]
+            static extern bool FreeLibrary(IntPtr hModule);
+
+            [DllImport("libdl")]
+            protected static extern IntPtr dlopen(string filename, int flags);
+
+            [DllImport("libdl")]
+            protected static extern IntPtr dlsym(IntPtr handle, string symbol);
+
+            [DllImport("libdl")]
+            protected static extern IntPtr dlerror();
+
+            [DllImport("libdl")]
+            protected static extern int dlclose(IntPtr handle);
+
+            internal static IntPtr DllHandle = IntPtr.Zero;
+            private static object[] mParams = new object[0];
+
+            internal static object[] GetParams(int size)
+            {
+                Array.Resize<object>(ref mParams, size);
+                return mParams;
+            }
+
+            internal static void LoadDLL(string dataPath)
+            {
+                //load external library
+                if (DllHandle == IntPtr.Zero)
+                {
+                    string LibDestination = "";
+
+                    if (IsWindows())
+                    {
+                        LibDestination = Path.Combine(dataPath, "Plugins/Substance.Engine.dll");
+                        DllHandle = LoadLibrary(LibDestination);
+
+                        if (DllHandle == IntPtr.Zero)
+                        {
+                            // Unity added the subfolder 'x86_64' in Unity2019.3.9f1 & later versions...
+                            LibDestination = Path.Combine(dataPath, "Plugins/x86_64/Substance.Engine.dll");
+                            DllHandle = LoadLibrary(LibDestination);
+                        }
+                    }
+                    else if (IsMac())
+                    {
+                        LibDestination = Path.Combine(dataPath, "Plugins/Substance.Engine.bundle/Contents/MacOS/Substance.Engine");
+                        DllHandle = dlopen(LibDestination, 3);
+                    }
+                    else if (IsLinux())
+                    {
+                        LibDestination = Path.Combine(dataPath, "Plugins/libSubstance.Engine.so");
+                        DllHandle = dlopen(LibDestination, 3);
+                    }
+
+                    if (DllHandle == IntPtr.Zero)
+                    {
+                        Debug.LogError("Substance engine failed to load.");
+                    }
+                }
+            }
+
+            internal static void UnloadDLL()
+            {
+                if (DllHandle != IntPtr.Zero)
+                {
+                    if (IsWindows())
+                    {
+                        FreeLibrary(DllHandle);
+                    }
+                    else if (IsMac() || IsLinux())
+                    {
+                        dlclose(DllHandle);
+                    }
+
+                    DllHandle = IntPtr.Zero;
+                }
+            }
+
+            internal static Delegate GetFunction(string funcname, Type t)
+            {
+                IntPtr ptr = IntPtr.Zero;
+                if (DllHandle == IntPtr.Zero)
+                    return null;
+
+                if (IsWindows())
+                {
+                    ptr = GetProcAddress(DllHandle, funcname);
+                }
+                else if (IsMac() || IsLinux())
+                {
+                    ptr = dlsym(DllHandle, funcname);
+                }
+
+                if (ptr == IntPtr.Zero)
+                {
+                    return null;
+                }
+
+                return Marshal.GetDelegateForFunctionPointer(ptr, t);
+            }
+
+            private static bool IsWindows()
+            {
+                return (Application.platform == RuntimePlatform.WindowsEditor
+                        || Application.platform == RuntimePlatform.WindowsPlayer);
+            }
+
+            private static bool IsMac()
+            {
+                return (Application.platform == RuntimePlatform.OSXEditor
+                        || Application.platform == RuntimePlatform.OSXPlayer);
+            }
+
+            private static bool IsLinux()
+            {
+                return (Application.platform == RuntimePlatform.LinuxEditor
+                        || Application.platform == RuntimePlatform.LinuxPlayer);
+            }
+        }
+#endif // IMPORT_DYNAMIC
+
+                            // ======================================================================
+#if IMPORT_DYNAMIC
+            public delegate IntPtr cppHelloDelegate();
+        public static IntPtr cppHello()
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return IntPtr.Zero;
+
+            cppHelloDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppHelloDelegate)) as cppHelloDelegate;
+            return (IntPtr)function.Invoke();
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern IntPtr cppHello();
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate void cppInitSubstanceDelegate(string applicationDataPath, int pTextureClampExposant);
+        public static void cppInitSubstance(string applicationDataPath, int pTextureClampExposant)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            DLLHelpers.LoadDLL(applicationDataPath);
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return;
+
+            cppInitSubstanceDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppInitSubstanceDelegate)) as cppInitSubstanceDelegate;
+            function.Invoke(applicationDataPath, pTextureClampExposant);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern void cppInitSubstance(string applicationDataPath, int pTextureClampExposant);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate void cppSetCallbacksDelegate(IntPtr log, IntPtr texture, IntPtr numerical, IntPtr graphInitialized);
+        public static void cppSetCallbacks(IntPtr log, IntPtr texture, IntPtr numerical, IntPtr graphInitialized)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return;
+
+            cppSetCallbacksDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppSetCallbacksDelegate)) as cppSetCallbacksDelegate;
+            function.Invoke(log, texture, numerical, graphInitialized);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern void cppSetCallbacks(IntPtr log, IntPtr texture, IntPtr numerical, IntPtr graphInitialized);
+#endif
+
+#if IMPORT_DYNAMIC // not used!
+        public delegate bool cppIsValidGraphHandleDelegate(IntPtr pGraphHandle);
+        public static bool cppIsValidGraphHandle(IntPtr pGraphHandle)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return false;
+
+            cppIsValidGraphHandleDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppIsValidGraphHandleDelegate)) as cppIsValidGraphHandleDelegate;
+            return function.Invoke(pGraphHandle);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern bool cppIsValidGraphHandle(IntPtr pGraphHandle);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate void cppApplyPresetDelegate(IntPtr graphHandle, string presetStr);
+        public static void cppApplyPreset(IntPtr graphHandle, string presetStr)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return;
+
+            cppApplyPresetDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppApplyPresetDelegate)) as cppApplyPresetDelegate;
+            function.Invoke(graphHandle, presetStr);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern void cppApplyPreset(IntPtr graphHandle, string presetStr);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate IntPtr cppGetPresetDelegate(IntPtr graphHandle);
+        public static IntPtr cppGetPreset(IntPtr graphHandle)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return IntPtr.Zero;
+
+            cppGetPresetDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetPresetDelegate)) as cppGetPresetDelegate;
+            return (IntPtr)function.Invoke(graphHandle);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern IntPtr cppGetPreset(IntPtr graphHandle);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate IntPtr cppListAssetsDelegate();
+        public static IntPtr cppListAssets()
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return IntPtr.Zero;
+
+            cppListAssetsDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppListAssetsDelegate)) as cppListAssetsDelegate;
+            return (IntPtr)function.Invoke();
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern IntPtr cppListAssets();
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate int cppGetNumOutputsDelegate(IntPtr graphHandle);
+        public static int cppGetNumOutputs(IntPtr graphHandle)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return 0;
+
+            cppGetNumOutputsDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetNumOutputsDelegate)) as cppGetNumOutputsDelegate;
+            return (int)function.Invoke(graphHandle);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern int cppGetNumOutputs(IntPtr graphHandle);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate IntPtr cppGetColorSpaceListDelegate(IntPtr graphHandle, int numOutputs);
+        public static IntPtr cppGetColorSpaceList(IntPtr graphHandle, int numOutputs)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return IntPtr.Zero;
+
+            cppGetColorSpaceListDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetColorSpaceListDelegate)) as cppGetColorSpaceListDelegate;
+            return (IntPtr)function.Invoke(graphHandle, numOutputs);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern IntPtr cppGetColorSpaceList(IntPtr graphHandle, int numOutputs);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate void cppFreeMemoryDelegate(IntPtr pointer);
+        public static void cppFreeMemory(IntPtr pointer)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return;
+
+            cppFreeMemoryDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppFreeMemoryDelegate)) as cppFreeMemoryDelegate;
+            function.Invoke(pointer);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern void cppFreeMemory(IntPtr pointer);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate void cppSetCreateSubstanceGraphCallbackEditorPtrDelegate(IntPtr fp);
+        public static void cppSetCreateSubstanceGraphCallbackEditorPtr(IntPtr fp)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return;
+
+            cppSetCreateSubstanceGraphCallbackEditorPtrDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppSetCreateSubstanceGraphCallbackEditorPtrDelegate)) as cppSetCreateSubstanceGraphCallbackEditorPtrDelegate;
+            function.Invoke(fp);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern void cppSetCreateSubstanceGraphCallbackEditorPtr(IntPtr fp);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate IntPtr cppGetMInputsDelegate(IntPtr graphHandle, int pNumInputs);
+        public static IntPtr cppGetMInputs(IntPtr graphHandle, int pNumInputs)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return IntPtr.Zero;
+
+            cppGetMInputsDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetMInputsDelegate)) as cppGetMInputsDelegate;
+            return (IntPtr)function.Invoke(graphHandle, pNumInputs);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern IntPtr cppGetMInputs(IntPtr graphHandle, int pNumInputs);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate IntPtr cppGetOutputsDescDelegate(IntPtr graphHandle, ref int pNumOutputs);
+        public static IntPtr cppGetOutputsDesc(IntPtr graphHandle, ref int pNumOutputs)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return IntPtr.Zero;
+
+            cppGetOutputsDescDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetOutputsDescDelegate)) as cppGetOutputsDescDelegate;
+            return (IntPtr)function.Invoke(graphHandle, ref pNumOutputs);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern IntPtr cppGetOutputsDesc(IntPtr graphHandle, ref int pNumOutputs);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate int cppShutdownSubstanceDelegate();
+        public static int cppShutdownSubstance()
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return 0;
+
+            cppShutdownSubstanceDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppShutdownSubstanceDelegate)) as cppShutdownSubstanceDelegate;
+            int result = (int)function.Invoke();
+
+            DLLHelpers.UnloadDLL();
+
+            return result;
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern int cppShutdownSubstance();
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate int cppRemoveAssetDelegate(string pAssetPath);
+        public static int cppRemoveAsset(string pAssetPath)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return 0;
+
+            cppRemoveAssetDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppRemoveAssetDelegate)) as cppRemoveAssetDelegate;
+            return (int)function.Invoke(pAssetPath);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern int cppRemoveAsset(string pAssetPath);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate int cppMoveAssetDelegate(string pFromAssetPath, string pToAssetPath);
+        public static int cppMoveAsset(string pFromAssetPath, string pToAssetPath)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return 0;
+
+            cppMoveAssetDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppMoveAssetDelegate)) as cppMoveAssetDelegate;
+            return (int)function.Invoke(pFromAssetPath, pToAssetPath);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern int cppMoveAsset(string pFromAssetPath, string pToAssetPath);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate int cppLoadSubstanceDelegate(string pAssetPath, IntPtr array, Int32 size,
+            IntPtr assetCtx, IntPtr substanceObject,
+            UInt32[] graphIndices, string[] graphPrototypeNames, string[] graphLabels,
+            int[] graphFormats, int[] normalFormats, UInt32 numGraphIndices,
+            int rawOverride, int pPipeline);
+        public static int cppLoadSubstance(string pAssetPath, IntPtr array, Int32 size, IntPtr assetCtx, IntPtr substanceObject,
+                                           UInt32[] graphIndices, string[] graphPrototypeNames, string[] graphLabels,
+                                           int[] graphFormats, int[] normalFormats, UInt32 numGraphIndices,
+                                           int rawOverride, int pPipeline)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return 0;
+
+            cppLoadSubstanceDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppLoadSubstanceDelegate)) as cppLoadSubstanceDelegate;
+            return (int)function.Invoke(pAssetPath, array, size, assetCtx, substanceObject,
+                                        graphIndices, graphPrototypeNames, graphLabels,
+                                        graphFormats, normalFormats, numGraphIndices,
+                                        rawOverride, pPipeline);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern int cppLoadSubstance(string pAssetPath, IntPtr array, Int32 size, IntPtr assetCtx,
+            IntPtr substanceObject, UInt32[] graphIndices, string[] graphPrototypeNames, string[] graphLabels,
+            int[] graphFormats, int[] normalFormats, UInt32 numGraphIndices, int rawOverride, int pPipeline);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate void cppQueueSubstanceDelegate(IntPtr graphHandle);
+        public static void cppQueueSubstance(IntPtr graphHandle)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return;
+
+            cppQueueSubstanceDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppQueueSubstanceDelegate)) as cppQueueSubstanceDelegate;
+            function.Invoke(graphHandle);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern void cppQueueSubstance(IntPtr graphHandle);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate uint cppRenderSubstancesDelegate(bool bAsync, IntPtr preComputeCallback);
+        public static uint cppRenderSubstances(bool bAsync, IntPtr preComputeCallback)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return 0;
+
+            cppRenderSubstancesDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppRenderSubstancesDelegate)) as cppRenderSubstancesDelegate;
+            return (uint)function.Invoke(bAsync, preComputeCallback);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern uint cppRenderSubstances(bool bAsync, IntPtr preComputeCallback);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate bool cppIsRendererBusyDelegate(uint runid);
+        public static bool cppIsRendererBusy(uint runid)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return false;
+
+            cppIsRendererBusyDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppIsRendererBusyDelegate)) as cppIsRendererBusyDelegate;
+            return (bool)function.Invoke(runid);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern bool cppIsRendererBusy(uint runid);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate void cppSetDirtyOutputsDelegate(IntPtr graphHandle);
+        public static void cppSetDirtyOutputs(IntPtr graphHandle)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return;
+
+            cppSetDirtyOutputsDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppSetDirtyOutputsDelegate)) as cppSetDirtyOutputsDelegate;
+            function.Invoke(graphHandle);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern void cppSetDirtyOutputs(IntPtr graphHandle);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate int cppGetNumInputsDelegate(IntPtr graphHandle);
+        public static int cppGetNumInputs(IntPtr graphHandle)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return 0;
+
+            cppGetNumInputsDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetNumInputsDelegate)) as cppGetNumInputsDelegate;
+            return (int)function.Invoke(graphHandle);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern int cppGetNumInputs(IntPtr graphHandle);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate IntPtr cppGetInput_IntsDelegate(IntPtr graphHandle, string pFieldName, int pNumInputs);
+        public static IntPtr cppGetInput_Ints(IntPtr graphHandle, string pFieldName, int pNumInputs)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return IntPtr.Zero;
+
+            cppGetInput_IntsDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetInput_IntsDelegate)) as cppGetInput_IntsDelegate;
+            return (IntPtr)function.Invoke(graphHandle, pFieldName, pNumInputs);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern IntPtr cppGetInput_Ints(IntPtr graphHandle, string pFieldName, int pNumInputs);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate IntPtr cppGetMComboBoxItemsDelegate(IntPtr graphHandle, string pIdentifier, out int pNumValues);
+        public static IntPtr cppGetMComboBoxItems(IntPtr graphHandle, string pIdentifier, out int pNumValues)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+            {
+                pNumValues = 0;
+                return IntPtr.Zero;
+            }
+
+            cppGetMComboBoxItemsDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetMComboBoxItemsDelegate)) as cppGetMComboBoxItemsDelegate;
+            return (IntPtr)function.Invoke(graphHandle, pIdentifier, out pNumValues);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern IntPtr cppGetMComboBoxItems(IntPtr graphHandle, string pIdentifier, out int pNumValues);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate void cppGetInput_FloatDelegate(IntPtr graphHandle, string pInputName, float[] values, UInt32 numValues);
+        public static void cppGetInput_Float(IntPtr graphHandle, string pInputName, float[] values, UInt32 numValues)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return;
+
+            cppGetInput_FloatDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetInput_FloatDelegate)) as cppGetInput_FloatDelegate;
+            function.Invoke(graphHandle, pInputName, values, numValues);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern void cppGetInput_Float(IntPtr graphHandle, string pInputName, float[] values, UInt32 numValues);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate int cppSetInput_FloatDelegate(IntPtr graphHandle, string pInputName, float[] values, UInt32 numValues);
+        public static int cppSetInput_Float(IntPtr graphHandle, string pInputName, float[] values, UInt32 numValues)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return -2;
+
+            cppSetInput_FloatDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppSetInput_FloatDelegate)) as cppSetInput_FloatDelegate;
+            return (int)function.Invoke(graphHandle, pInputName, values, numValues);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern int cppSetInput_Float(IntPtr graphHandle, string pInputName, float[] values, UInt32 numValues);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate void cppGetInput_IntDelegate(IntPtr graphHandle, string pInputName, int[] values, UInt32 numValues);
+        public static void cppGetInput_Int(IntPtr graphHandle, string pInputName, int[] values, UInt32 numValues)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return;
+
+            cppGetInput_IntDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetInput_IntDelegate)) as cppGetInput_IntDelegate;
+            function.Invoke(graphHandle, pInputName, values, numValues);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern void cppGetInput_Int(IntPtr graphHandle, string pInputName, int[] values, UInt32 numValues);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate void cppSetInput_IntDelegate(IntPtr graphHandle, string pInputName, int[] values, UInt32 numValues);
+        public static void cppSetInput_Int(IntPtr graphHandle, string pInputName, int[] values, UInt32 numValues)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return;
+
+            cppSetInput_IntDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppSetInput_IntDelegate)) as cppSetInput_IntDelegate;
+            function.Invoke(graphHandle, pInputName, values, numValues);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern void cppSetInput_Int(IntPtr graphHandle, string pInputName, int[] values, UInt32 numValues);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate int cppSetInput_StringDelegate(IntPtr graphHandle, string pInputName, string value);
+        public static int cppSetInput_String(IntPtr graphHandle, string pInputName, string value)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return -2;
+
+            cppSetInput_StringDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppSetInput_StringDelegate)) as cppSetInput_StringDelegate;
+            return (int)function.Invoke(graphHandle, pInputName, value);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern int cppSetInput_String(IntPtr graphHandle, string pInputName, string value);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate IntPtr cppGetInput_StringDelegate(IntPtr graphHandle, string pInputName);
+        public static IntPtr cppGetInput_String(IntPtr graphHandle, string pInputName)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return IntPtr.Zero;
+
+            cppGetInput_StringDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetInput_StringDelegate)) as cppGetInput_StringDelegate;
+            return (IntPtr)function.Invoke(graphHandle, pInputName);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern IntPtr cppGetInput_String(IntPtr graphHandle, string pInputName);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate int cppSetInput_TextureDelegate(IntPtr graphHandle, string pInputName, int format, int mipCount, int width, int height, IntPtr pixels);
+        public static int cppSetInput_Texture(IntPtr graphHandle, string pInputName, int format, int mipCount, int width, int height, IntPtr pixels)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return -2;
+
+            cppSetInput_TextureDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppSetInput_TextureDelegate)) as cppSetInput_TextureDelegate;
+            return (int)function.Invoke(graphHandle, pInputName, format, mipCount, width, height, pixels);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern int cppSetInput_Texture(IntPtr graphHandle, string pInputName, int format, int mipCount, int width, int height, IntPtr pixels);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate int cppProcessQueuedOutputsDelegate();
+        public static int cppProcessQueuedOutputs()
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return 0;
+
+            cppProcessQueuedOutputsDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppProcessQueuedOutputsDelegate)) as cppProcessQueuedOutputsDelegate;
+            return (int)function.Invoke();
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern int cppProcessQueuedOutputs();
+#endif
+
+#if IMPORT_DYNAMIC // not used anymore
+        public delegate IntPtr cppGetOutputLabelFromHashDelegate(string pAssetPath, UInt32 outputHash);
+        public static IntPtr cppGetOutputLabelFromHash(string pAssetPath, UInt32 outputHash)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return IntPtr.Zero;
+
+            cppGetOutputLabelFromHashDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetOutputLabelFromHashDelegate)) as cppGetOutputLabelFromHashDelegate;
+            return (IntPtr)function.Invoke(pAssetPath, outputHash);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern IntPtr cppGetOutputLabelFromHash(string pAssetPath, UInt32 outputHash);
+#endif
+
+#if IMPORT_DYNAMIC // not used anymore
+        public delegate IntPtr cppGetOutputIdentifierFromHashDelegate(string pAssetPath, UInt32 outputHash);
+        public static IntPtr cppGetOutputIdentifierFromHash(string pAssetPath, UInt32 outputHash)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return IntPtr.Zero;
+
+            cppGetOutputIdentifierFromHashDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetOutputIdentifierFromHashDelegate)) as cppGetOutputIdentifierFromHashDelegate;
+            return (IntPtr)function.Invoke(pAssetPath, outputHash);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern IntPtr cppGetOutputIdentifierFromHash(string pAssetPath, UInt32 outputHash);
+#endif
+
+#if IMPORT_DYNAMIC // not used anymore
+        public delegate bool cppIsImageOutputFromHashDelegate(string pAssetPath, UInt32 outputHash);
+        public static bool cppIsImageOutputFromHash(string pAssetPath, UInt32 outputHash)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return false;
+
+            cppIsImageOutputFromHashDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppIsImageOutputFromHashDelegate)) as cppIsImageOutputFromHashDelegate;
+            return (bool)function.Invoke(pAssetPath, outputHash);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern bool cppIsImageOutputFromHash(string pAssetPath, UInt32 outputHash);
+#endif
+
+#if IMPORT_DYNAMIC // not used anymore
+        public delegate IntPtr cppGetOutputChannelStrFromHashDelegate(string pAssetPath, UInt32 outputHash);
+        public static IntPtr cppGetOutputChannelStrFromHash(string pAssetPath, UInt32 outputHash)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return IntPtr.Zero;
+
+            cppGetOutputChannelStrFromHashDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetOutputChannelStrFromHashDelegate)) as cppGetOutputChannelStrFromHashDelegate;
+            return (IntPtr)function.Invoke(pAssetPath, outputHash);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern IntPtr cppGetOutputChannelStrFromHash(string pAssetPath, UInt32 outputHash);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate void cppOnGenerateMipMapsChangedDelegate(IntPtr graphHandle, bool bGenerateMipMaps);
+        public static void cppOnGenerateMipMapsChanged(IntPtr graphHandle, bool bGenerateMipMaps)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return;
+
+            cppOnGenerateMipMapsChangedDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppOnGenerateMipMapsChangedDelegate)) as cppOnGenerateMipMapsChangedDelegate;
+            function.Invoke(graphHandle, bGenerateMipMaps);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern void cppOnGenerateMipMapsChanged(IntPtr graphHandle, bool bGenerateMipMaps);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate void cppModifyTexturePackingDelegate(IntPtr graphHandle,
+                                                   string pSourceNames, int[] pSourceComponents,
+                                                   string pTargetName, int[] pTargetComponents,
+                                                    int pNumComponents);
+        public static void cppModifyTexturePacking(IntPtr graphHandle,
+                                                   string pSourceNames, int[] pSourceComponents,
+                                                   string pTargetName, int[] pTargetComponents,
+                                                   int pNumComponents)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return;
+
+            cppModifyTexturePackingDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppModifyTexturePackingDelegate)) as cppModifyTexturePackingDelegate;
+            function.Invoke(graphHandle,
+                            pSourceNames, pSourceComponents,
+                            pTargetName, pTargetComponents,
+                            pNumComponents);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern void cppModifyTexturePacking(IntPtr graphHandle,
+                                                   string pSourceNames, int[] pSourceComponents,
+                                                   string pTargetName, int[] pTargetComponents,
+                                                   int pNumComponents);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate void cppGetTextureDimensionsDelegate(IntPtr graphHandle, out int pWidth, out int pHeight);
+        public static void cppGetTextureDimensions(IntPtr graphHandle, out int pWidth, out int pHeight)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+            {
+                pWidth = 256;
+                pHeight = 256;
+                return;
+            }
+
+            cppGetTextureDimensionsDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetTextureDimensionsDelegate)) as cppGetTextureDimensionsDelegate;
+            function.Invoke(graphHandle, out pWidth, out pHeight);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern void cppGetTextureDimensions(IntPtr graphHandle, out int pWidth, out int pHeight);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate IntPtr cppDuplicateGraphInstanceDelegate(IntPtr graphHandle);
+        public static IntPtr cppDuplicateGraphInstance(IntPtr graphHandle)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return IntPtr.Zero;
+
+            cppDuplicateGraphInstanceDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppDuplicateGraphInstanceDelegate)) as cppDuplicateGraphInstanceDelegate;
+            return (IntPtr)function.Invoke(graphHandle);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern IntPtr cppDuplicateGraphInstance(IntPtr graphHandle);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate void cppRemoveGraphInstanceDelegate(IntPtr graphHandle);
+        public static void cppRemoveGraphInstance(IntPtr graphHandle)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return;
+
+            cppRemoveGraphInstanceDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppRemoveGraphInstanceDelegate)) as cppRemoveGraphInstanceDelegate;
+            function.Invoke(graphHandle);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern void cppRemoveGraphInstance(IntPtr graphHandle);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate int cppListInputsDelegate(IntPtr graphHandle);
+        public static int cppListInputs(IntPtr graphHandle)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return -2;
+
+            cppListInputsDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppListInputsDelegate)) as cppListInputsDelegate;
+            return (int)function.Invoke(graphHandle);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern int cppListInputs(IntPtr graphHandle);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate IntPtr cppGetChannelNamesDelegate();
+        public static IntPtr cppGetChannelNames()
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return IntPtr.Zero;
+
+            cppGetChannelNamesDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetChannelNamesDelegate)) as cppGetChannelNamesDelegate;
+            return (IntPtr)function.Invoke();
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern IntPtr cppGetChannelNames();
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate uint cppGetOutputHashDelegate(IntPtr graphHandle, int pOutputIndex);
+        public static uint cppGetOutputHash(IntPtr graphHandle, int pOutputIndex)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return 0;
+
+            cppGetOutputHashDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetOutputHashDelegate)) as cppGetOutputHashDelegate;
+            return (uint)function.Invoke(graphHandle, pOutputIndex);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern uint cppGetOutputHash(IntPtr graphHandle, int outputIndex);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate IntPtr cppGetEngineVersionDelegate();
+        public static IntPtr cppGetEngineVersion()
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return IntPtr.Zero;
+
+            cppGetEngineVersionDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetEngineVersionDelegate)) as cppGetEngineVersionDelegate;
+            return (IntPtr)function.Invoke();
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern IntPtr cppGetEngineVersion();
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate int cppGetNumberOfDuplicatedGraphsDelegate(IntPtr graphHandle);
+        public static int cppGetNumberOfDuplicatedGraphs(IntPtr graphHandle)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return 0;
+
+            cppGetNumberOfDuplicatedGraphsDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetNumberOfDuplicatedGraphsDelegate)) as cppGetNumberOfDuplicatedGraphsDelegate;
+            return (int)function.Invoke(graphHandle);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern int cppGetNumberOfDuplicatedGraphs(IntPtr graphHandle);
+#endif
+
+#if IMPORT_DYNAMIC
+        public delegate int cppGetOldFileIdDelegate(string pCharArray, int pTypeConstant);
+
+        public static int cppComputeOldFileID(string pCharArray, int pTypeConstant)
+        {
+            string myName = System.Reflection.MethodBase.GetCurrentMethod().Name;
+
+            if (DLLHelpers.DllHandle == IntPtr.Zero)
+                return 0;
+
+            cppGetOldFileIdDelegate function = DLLHelpers.GetFunction(
+                myName, typeof(cppGetOldFileIdDelegate)) as cppGetOldFileIdDelegate;
+            return (int)function.Invoke(pCharArray, pTypeConstant);
+        }
+#else
+        [DllImport(attributeValue)]
+        public static extern int cppComputeOldFileID(string pCharArray, int pTypeConstant);
+#endif
+
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/IChangeSource.cs.meta b/Assets/Allegorithmic/Plugins/Substance.Platform/NativeFunctions.cs.meta
similarity index 83%
rename from Assets/Scripts/ServerShared/IChangeSource.cs.meta
rename to Assets/Allegorithmic/Plugins/Substance.Platform/NativeFunctions.cs.meta
index 7e0c6be5a..f42f4e7fc 100644
--- a/Assets/Scripts/ServerShared/IChangeSource.cs.meta
+++ b/Assets/Allegorithmic/Plugins/Substance.Platform/NativeFunctions.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9188eb1236c6f6f42b4c2d04b3111867
+guid: f73e545cdd1f46142b3224490c49ffc7
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/Allegorithmic/Plugins/Substance.Platform/Substance.Platform.asmdef b/Assets/Allegorithmic/Plugins/Substance.Platform/Substance.Platform.asmdef
new file mode 100644
index 000000000..91edc4a8d
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.Platform/Substance.Platform.asmdef
@@ -0,0 +1,3 @@
+{
+	"name": "Substance.Platform"
+}
diff --git a/Assets/Allegorithmic/Plugins/Substance.Platform/Substance.Platform.asmdef.meta b/Assets/Allegorithmic/Plugins/Substance.Platform/Substance.Platform.asmdef.meta
new file mode 100644
index 000000000..338550242
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.Platform/Substance.Platform.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 58fa44ce6f4ca4141afa97beeb7d26e8
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance.meta b/Assets/Allegorithmic/Plugins/Substance.meta
new file mode 100644
index 000000000..166ec741a
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6b66a8036020dbb4fb85b53b38ca6d2e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Arm64.meta b/Assets/Allegorithmic/Plugins/Substance/Arm64.meta
new file mode 100644
index 000000000..15775c991
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Arm64.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ba23d9f2a90df96449812c46e488766e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Arm64/libSubstance.Engine.Mobile.so b/Assets/Allegorithmic/Plugins/Substance/Arm64/libSubstance.Engine.Mobile.so
new file mode 100644
index 000000000..6f22f5862
Binary files /dev/null and b/Assets/Allegorithmic/Plugins/Substance/Arm64/libSubstance.Engine.Mobile.so differ
diff --git a/Assets/Allegorithmic/Plugins/Substance/Arm64/libSubstance.Engine.Mobile.so.meta b/Assets/Allegorithmic/Plugins/Substance/Arm64/libSubstance.Engine.Mobile.so.meta
new file mode 100644
index 000000000..209b4b1e4
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Arm64/libSubstance.Engine.Mobile.so.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 95195e4255ae5cf48879b04f6b0c1879
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARM64
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Arm64/libalgcompression.a b/Assets/Allegorithmic/Plugins/Substance/Arm64/libalgcompression.a
new file mode 100644
index 000000000..44bc9ab3f
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Arm64/libalgcompression.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3f186bbbc2f4d81a45b83fb245f4a0cf244d842bef81c690080b0069f3be9dd
+size 285544
diff --git a/Assets/Allegorithmic/Plugins/Substance/Arm64/libalgcompression.a.meta b/Assets/Allegorithmic/Plugins/Substance/Arm64/libalgcompression.a.meta
new file mode 100644
index 000000000..3f5d9cebe
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Arm64/libalgcompression.a.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: c7a5e377c8a412d43a6acb1c7e6599d9
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARM64
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Arm64/libpfxlinkercommon.a b/Assets/Allegorithmic/Plugins/Substance/Arm64/libpfxlinkercommon.a
new file mode 100644
index 000000000..536fb3c75
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Arm64/libpfxlinkercommon.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:995c61bdcbf9ab2de4e3185daa1d531f4a3795a80820d8c4b768bc57882dcdff
+size 615600
diff --git a/Assets/Allegorithmic/Plugins/Substance/Arm64/libpfxlinkercommon.a.meta b/Assets/Allegorithmic/Plugins/Substance/Arm64/libpfxlinkercommon.a.meta
new file mode 100644
index 000000000..9aca8aed9
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Arm64/libpfxlinkercommon.a.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: e4536a5af9c102d45829249980c67f5d
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARM64
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_framework.a b/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_framework.a
new file mode 100644
index 000000000..42e022208
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_framework.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb37505297742cda05e3e94d1f47aa0822c35f29f75564bdb044fd6df6840c91
+size 1112490
diff --git a/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_framework.a.meta b/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_framework.a.meta
new file mode 100644
index 000000000..c9d7c6ba6
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_framework.a.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 2697b2af0b223cf4da67834d6a1732ed
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARM64
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_linker.a b/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_linker.a
new file mode 100644
index 000000000..0a8524c00
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_linker.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91418c45b21c65d00125018239191432cf1dd53a66e6d640f1431f14130ebc51
+size 99912
diff --git a/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_linker.a.meta b/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_linker.a.meta
new file mode 100644
index 000000000..660c0a433
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_linker.a.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 512de381d3d9b6c4ca757abbf394da94
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARM64
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_neon_blend.a b/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_neon_blend.a
new file mode 100644
index 000000000..1acd88e23
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_neon_blend.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2421f458bde62d5fd7ccc859d159d145394c4fc00c7c190ee0dc04df1608a3a6
+size 1196250
diff --git a/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_neon_blend.a.meta b/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_neon_blend.a.meta
new file mode 100644
index 000000000..c3437eeb5
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Arm64/libsubstance_neon_blend.a.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: f418178d86adbdd419a3b8e7f6f8e97e
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARM64
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Arm64/libtinyxml.a b/Assets/Allegorithmic/Plugins/Substance/Arm64/libtinyxml.a
new file mode 100644
index 000000000..cce3c7d7a
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Arm64/libtinyxml.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:66e9ceea03c036faaecf733a0e05faecd469023f4a51445aefad76fab794f794
+size 110154
diff --git a/Assets/Allegorithmic/Plugins/Substance/Arm64/libtinyxml.a.meta b/Assets/Allegorithmic/Plugins/Substance/Arm64/libtinyxml.a.meta
new file mode 100644
index 000000000..6a8b78894
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Arm64/libtinyxml.a.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 9d14103a404e5fa449d672ed3c606c9a
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARM64
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Armv7.meta b/Assets/Allegorithmic/Plugins/Substance/Armv7.meta
new file mode 100644
index 000000000..f4f87ae67
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Armv7.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fdd4431c8cc591b458db4e3d5caeb5c9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Armv7/libSubstance.Engine.Mobile.so b/Assets/Allegorithmic/Plugins/Substance/Armv7/libSubstance.Engine.Mobile.so
new file mode 100644
index 000000000..3eb2a2ac1
Binary files /dev/null and b/Assets/Allegorithmic/Plugins/Substance/Armv7/libSubstance.Engine.Mobile.so differ
diff --git a/Assets/Allegorithmic/Plugins/Substance/Armv7/libSubstance.Engine.Mobile.so.meta b/Assets/Allegorithmic/Plugins/Substance/Armv7/libSubstance.Engine.Mobile.so.meta
new file mode 100644
index 000000000..1035e0e8f
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Armv7/libSubstance.Engine.Mobile.so.meta
@@ -0,0 +1,93 @@
+fileFormatVersion: 2
+guid: bd2716a347a7e9943afaa77770bcd8cb
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Armv7/libalgcompression.a b/Assets/Allegorithmic/Plugins/Substance/Armv7/libalgcompression.a
new file mode 100644
index 000000000..27524d1ad
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Armv7/libalgcompression.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f000ea1093f45283b68b03d1db1f42403c189caeeee708736224c2d74a5a721
+size 294384
diff --git a/Assets/Allegorithmic/Plugins/Substance/Armv7/libalgcompression.a.meta b/Assets/Allegorithmic/Plugins/Substance/Armv7/libalgcompression.a.meta
new file mode 100644
index 000000000..8ca0493a0
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Armv7/libalgcompression.a.meta
@@ -0,0 +1,102 @@
+fileFormatVersion: 2
+guid: 495b6c512f4d59d40888042682524609
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        AddToEmbeddedBinaries: false
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Armv7/libpfxlinkercommon.a b/Assets/Allegorithmic/Plugins/Substance/Armv7/libpfxlinkercommon.a
new file mode 100644
index 000000000..5dd9c9131
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Armv7/libpfxlinkercommon.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9bdda0bef5628f55230b438d92200766cd9d3be293d26d3de7374632e8e5784f
+size 641720
diff --git a/Assets/Allegorithmic/Plugins/Substance/Armv7/libpfxlinkercommon.a.meta b/Assets/Allegorithmic/Plugins/Substance/Armv7/libpfxlinkercommon.a.meta
new file mode 100644
index 000000000..4821bcb5e
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Armv7/libpfxlinkercommon.a.meta
@@ -0,0 +1,102 @@
+fileFormatVersion: 2
+guid: 2a7f4883f00e95944aae18f002cd402c
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        AddToEmbeddedBinaries: false
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_framework.a b/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_framework.a
new file mode 100644
index 000000000..501177caf
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_framework.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0308cf6b5f704a7522a425ce2bd2047992df7ab4e3d6d17be957f0e0f07a5ff0
+size 1171780
diff --git a/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_framework.a.meta b/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_framework.a.meta
new file mode 100644
index 000000000..91b60e001
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_framework.a.meta
@@ -0,0 +1,93 @@
+fileFormatVersion: 2
+guid: 61875352dc72741458e9768325e6fdff
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_linker.a b/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_linker.a
new file mode 100644
index 000000000..48e272d72
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_linker.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:013917413c0322be8bf3f50fb4186bb3dd064f4323dce936221c87eb01d6dd9d
+size 102920
diff --git a/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_linker.a.meta b/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_linker.a.meta
new file mode 100644
index 000000000..8b1856ebb
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_linker.a.meta
@@ -0,0 +1,93 @@
+fileFormatVersion: 2
+guid: 06afdfaf15b943f4787e2c6975d7a740
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_neon_blend.a b/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_neon_blend.a
new file mode 100644
index 000000000..45c5258dc
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_neon_blend.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f904fbf670847cec7c3fe70b71cbe322054721381642d3088bdbd91f09716ab
+size 1200786
diff --git a/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_neon_blend.a.meta b/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_neon_blend.a.meta
new file mode 100644
index 000000000..98d25d8a4
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Armv7/libsubstance_neon_blend.a.meta
@@ -0,0 +1,93 @@
+fileFormatVersion: 2
+guid: 6f13f81a37a3c384aadd828cec004529
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Armv7/libtinyxml.a b/Assets/Allegorithmic/Plugins/Substance/Armv7/libtinyxml.a
new file mode 100644
index 000000000..02bc3129d
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Armv7/libtinyxml.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48fc521d37cbed677f29ee47d5276a4a1114558da4009c6919892b5681b6f727
+size 112046
diff --git a/Assets/Allegorithmic/Plugins/Substance/Armv7/libtinyxml.a.meta b/Assets/Allegorithmic/Plugins/Substance/Armv7/libtinyxml.a.meta
new file mode 100644
index 000000000..fa8a90095
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Armv7/libtinyxml.a.meta
@@ -0,0 +1,93 @@
+fileFormatVersion: 2
+guid: 12f2d451d9e7a6042853f76cd12709cf
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Engine.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Engine.meta
new file mode 100644
index 000000000..03a076bc0
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Engine.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d25a62bcd306ea84e9f28c6413651822
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor.meta
new file mode 100644
index 000000000..768aec496
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3f4726f12049952419f4c64c5258b0c5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/MainObject.png b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/MainObject.png
new file mode 100644
index 000000000..3423aeb24
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/MainObject.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a3e1d9bdd0b5babca8b83c54dea385dbdbd579c13523f64c01e8b94527634ba
+size 3947
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/MainObject.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/MainObject.png.meta
new file mode 100644
index 000000000..8b2c143ad
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/MainObject.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: aafe557eeb7160a47b641dd1dd1c22e5
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll
new file mode 100644
index 000000000..558648c42
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:abad72ebbcae554ccf19cfb7819c182666897e91835c4a1f276d870f6d0004cb
+size 144384
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll.meta
new file mode 100644
index 000000000..a23962c79
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll.meta	
@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 43a8bbf65be290d44ba52b94476242b9
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.png b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.png
new file mode 100644
index 000000000..3423aeb24
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a3e1d9bdd0b5babca8b83c54dea385dbdbd579c13523f64c01e8b94527634ba
+size 3947
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.png.meta
new file mode 100644
index 000000000..ef0418e98
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 81def6dcc24154146add82fca73ae837
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/SubstanceGraph-32.png b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/SubstanceGraph-32.png
new file mode 100644
index 000000000..77a2e69f7
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/SubstanceGraph-32.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b66f14fd72c0da4759bc93de9094c79451c6df752fde49065a22041b69da8104
+size 574
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/SubstanceGraph-32.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/SubstanceGraph-32.png.meta
new file mode 100644
index 000000000..a7ef86927
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/SubstanceGraph-32.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: b0e4389d9170e77479cb7545d317f1e4
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/SubstanceGraph.png b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/SubstanceGraph.png
new file mode 100644
index 000000000..98416b36c
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/SubstanceGraph.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cb46b033db038b79e9c1012801f7ab6c7759cf5ec512971e6c9677cb55c2ce5
+size 3359
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/SubstanceGraph.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/SubstanceGraph.png.meta
new file mode 100644
index 000000000..f2588deff
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/SubstanceGraph.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 1d780aa7bd5a4144585c5c043852fb89
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source.meta
new file mode 100644
index 000000000..447d579e5
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6e43e01345f9d0d4c8bb26a83cb9beba
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor.meta
new file mode 100644
index 000000000..212bc7130
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e48b97b89cd16844a85cb4d8e537cb30
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images.meta
new file mode 100644
index 000000000..f8795a24c
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 253d23284e6c477408f8cdf8dda32bbc
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/AssetDownload.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/AssetDownload.png
new file mode 100644
index 000000000..ebe1abbd6
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/AssetDownload.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:22c0a26a940c50437dedf11c658e377e3dafefff8e00c3ff394088b7b31ed3b2
+size 8868
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/AssetDownload.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/AssetDownload.png.meta
new file mode 100644
index 000000000..2a8106856
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/AssetDownload.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: c8bd96180fd19c7409d3943be6056510
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/AvailableDownloads.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/AvailableDownloads.png
new file mode 100644
index 000000000..4a4cb753d
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/AvailableDownloads.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d32d91eb782c954eb2364ea7935ac7e2c31588880f995d2a31f0e923fd7ed84
+size 1352
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/AvailableDownloads.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/AvailableDownloads.png.meta
new file mode 100644
index 000000000..7c69bceb0
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/AvailableDownloads.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: bc33cf74971b4fc42981222e41058b7a
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/DetailExitButton.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/DetailExitButton.png
new file mode 100644
index 000000000..3eea6f144
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/DetailExitButton.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc74f8c4c2d1ecd36c27381a0f30b4665e0292462d2fda61146edc9eb452b441
+size 970
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/DetailExitButton.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/DetailExitButton.png.meta
new file mode 100644
index 000000000..16f7ad904
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/DetailExitButton.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 6996eeabde665004d88d70b5568b4871
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/LoginButton.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/LoginButton.png
new file mode 100644
index 000000000..ab28e93f9
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/LoginButton.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de93331f3393a99681e5faf35bd0a0a8fe6211f0e33b7e90743d2775bed57970
+size 1598
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/LoginButton.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/LoginButton.png.meta
new file mode 100644
index 000000000..493d0c2a9
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/LoginButton.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 8cb8c80042f563747a21fc7805c2081f
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/LogoutButton.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/LogoutButton.png
new file mode 100644
index 000000000..3cd3b9a00
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/LogoutButton.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d43b2603af7260d2b285d8977971ee36c907f6ccfa2ce5b1484bd5002f1f9ea9
+size 1961
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/LogoutButton.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/LogoutButton.png.meta
new file mode 100644
index 000000000..9763f7e45
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/LogoutButton.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: e2f50db9f5a99a64eae92453b16d36a2
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/MagnifyingGlass.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/MagnifyingGlass.png
new file mode 100644
index 000000000..e4fd49f5f
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/MagnifyingGlass.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a3cbd43c2211be71594212f8c8c90b40475ccb3a08c6cad85214f78ec6be9bd
+size 860
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/MagnifyingGlass.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/MagnifyingGlass.png.meta
new file mode 100644
index 000000000..6f09d0385
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/MagnifyingGlass.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 9727ecbd18d8c2a4eb19cf9452ee2209
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/MyAssetsButton.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/MyAssetsButton.png
new file mode 100644
index 000000000..918ec6b70
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/MyAssetsButton.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:147cabd978ffe7a633deaa466b825ef11171685ed48e24319d2bfc6b82e7d840
+size 1214
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/MyAssetsButton.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/MyAssetsButton.png.meta
new file mode 100644
index 000000000..babbba0c4
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/MyAssetsButton.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 7249a3cd9feb57c4798cffecd1c0757b
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/Source.Icon.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/Source.Icon.png
new file mode 100644
index 000000000..e717364cf
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/Source.Icon.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:431ddc0993d0abff0834b5cc07e93b5f5cd84ca6f982a371bcb4ff06ecc9e9d3
+size 1324
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/Source.Icon.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/Source.Icon.png.meta
new file mode 100644
index 000000000..5fbf97177
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/Source.Icon.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 37b7a7d50220e1240a9c03e40ef0b20b
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/SubstanceSourceLoading.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/SubstanceSourceLoading.png
new file mode 100644
index 000000000..dd64aab4b
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/SubstanceSourceLoading.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c9c6ec70aa8209435851a44f9211e8c779558d02da3a1e2ad79dcfa3ea31a3b1
+size 206401
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/SubstanceSourceLoading.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/SubstanceSourceLoading.png.meta
new file mode 100644
index 000000000..8da5be6c8
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/SubstanceSourceLoading.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 439d59c05579e8a4381e9b67a11d2fd0
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/download.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/download.png
new file mode 100644
index 000000000..7b06bc9d4
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/download.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4eba6834ed20bb14c66b961c3af8b35d01a0348f97d169ecd086f8af5aab9afb
+size 1299
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/download.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/download.png.meta
new file mode 100644
index 000000000..5641b699f
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/download.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 22d1317c0c2f3d748862934cf49c7853
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/free.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/free.png
new file mode 100644
index 000000000..518622375
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/free.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:492706f07f47fbec60bdfdff290c9ae0c2b0e988d151ad95d108f5353cda0801
+size 3343
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/free.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/free.png.meta
new file mode 100644
index 000000000..fc868bd49
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/free.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 23d1a0e45c5c0334da1c4d4bed1f7614
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/leftarrow.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/leftarrow.png
new file mode 100644
index 000000000..7455f6e18
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/leftarrow.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:991310dae40561f6506dc15652cc3842b6709b8f156ddee2c1b10163004c4837
+size 8034
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/leftarrow.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/leftarrow.png.meta
new file mode 100644
index 000000000..d843d6ce7
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/leftarrow.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: bc8465860fe0b894e931e0108944a9ca
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/library.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/library.png
new file mode 100644
index 000000000..83aee9ce7
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/library.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:61f457fcad6c7a898c10ef31849f0d2a37cfe5ab4d5195638426342629ddae7f
+size 9730
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/library.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/library.png.meta
new file mode 100644
index 000000000..4f7e8e4ad
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/library.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 377d40e6ada35ef499b5019be79d0335
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/logo-substance.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/logo-substance.png
new file mode 100644
index 000000000..0450ac8e8
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/logo-substance.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:856a8f4cc3361de7dbe79bf0309e3b53f34c3d472b402d75e115c8fef116a783
+size 89138
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/logo-substance.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/logo-substance.png.meta
new file mode 100644
index 000000000..27355da9e
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/logo-substance.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 306d832c617e24b4ea77ee8d10ba0be3
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/logo-white.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/logo-white.png
new file mode 100644
index 000000000..cefe08b3c
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/logo-white.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc487bc1169f65f955681c61276f9e7af0676633140a26e4e54881984aabba1b
+size 3281
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/logo-white.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/logo-white.png.meta
new file mode 100644
index 000000000..a271c8217
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/logo-white.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: f560c6c6f0f366344ae48c963555f44c
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/new.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/new.png
new file mode 100644
index 000000000..cf987dd08
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/new.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bfdc8e184638e340316f0e5f36449791802514dc23bdfa7809a6f94965fb0205
+size 3282
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/new.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/new.png.meta
new file mode 100644
index 000000000..e2b774d81
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/new.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 32398645afbcdb04da696cc9872c8dc6
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/rightarrow.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/rightarrow.png
new file mode 100644
index 000000000..5ec967e92
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/rightarrow.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e05eb16d52675cdf21f2fd28d504a274e37fba2cd2f62cfb2e166a154bbe65b
+size 8023
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/rightarrow.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/rightarrow.png.meta
new file mode 100644
index 000000000..25ad90e6d
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/rightarrow.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 5f1c30aeb31461d43a461b1f087b03b7
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/spinner.png b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/spinner.png
new file mode 100644
index 000000000..6d8ee7be1
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/spinner.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:457c3cbe2cd0f6dc4b95c0bc97715ece30baa338a4b2c87cdfaf3a842689574c
+size 40654
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/spinner.png.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/spinner.png.meta
new file mode 100644
index 000000000..ea2dab3f6
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/Images/spinner.png.meta	
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 3c71e535d14fda04aa8c51cc3627bb29
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceInterfacex64.dll b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceInterfacex64.dll
new file mode 100644
index 000000000..4a2c3c8dd
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceInterfacex64.dll	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:20736c83277c0ecdb9cef386d06080f4f16d19d2d7c3eadc278b975950b25c0c
+size 1035264
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceInterfacex64.dll.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceInterfacex64.dll.meta
new file mode 100644
index 000000000..d9e628be9
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceInterfacex64.dll.meta	
@@ -0,0 +1,27 @@
+fileFormatVersion: 2
+guid: 28c31b01366243a449d2ae3be6ed1b91
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll
new file mode 100644
index 000000000..7dd82d4fd
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f4434869ce744ea0dde29980f5b1928f964c539c7b3ad1053530dbe5ce2e4ad1
+size 56320
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll.meta
new file mode 100644
index 000000000..b6b8bd059
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll.meta	
@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 65c7e91e1e95bd641ac5e20cf437098a
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/libSourceInterfacex64.dylib b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/libSourceInterfacex64.dylib
new file mode 100644
index 000000000..5a0844d63
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/libSourceInterfacex64.dylib	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b84c70cc3453d6fdf91ab75ec021201fc46906660a312ef798f223c438cac16
+size 5945140
diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/libSourceInterfacex64.dylib.meta b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/libSourceInterfacex64.dylib.meta
new file mode 100644
index 000000000..f73f22e45
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/libSourceInterfacex64.dylib.meta	
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a49b86618993b764f8c5a6eee502ae54
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/iOS.meta b/Assets/Allegorithmic/Plugins/Substance/iOS.meta
new file mode 100644
index 000000000..b0fb457a4
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/iOS.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4ee62c5f212bfe5459c844b0b3835b52
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/iOS/libSubstance.Engine.a b/Assets/Allegorithmic/Plugins/Substance/iOS/libSubstance.Engine.a
new file mode 100644
index 000000000..d7cf03816
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/iOS/libSubstance.Engine.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1b2800a74b550a4a5507d8a28aabc1d1df1c28edc8493a343511831061dafe6
+size 596200
diff --git a/Assets/Allegorithmic/Plugins/Substance/iOS/libSubstance.Engine.a.meta b/Assets/Allegorithmic/Plugins/Substance/iOS/libSubstance.Engine.a.meta
new file mode 100644
index 000000000..3767426d6
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/iOS/libSubstance.Engine.a.meta
@@ -0,0 +1,102 @@
+fileFormatVersion: 2
+guid: 07ad2ab8f6a1472449a018502e2eb5e4
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 0
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings:
+        AddToEmbeddedBinaries: false
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/iOS/libalgcompression.a b/Assets/Allegorithmic/Plugins/Substance/iOS/libalgcompression.a
new file mode 100644
index 000000000..96aacba6b
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/iOS/libalgcompression.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10d54ed1f790a3ed110ddc2b716040073697d6804c3fd2061bb607666f765614
+size 1631072
diff --git a/Assets/Allegorithmic/Plugins/Substance/iOS/libalgcompression.a.meta b/Assets/Allegorithmic/Plugins/Substance/iOS/libalgcompression.a.meta
new file mode 100644
index 000000000..c3fb60be7
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/iOS/libalgcompression.a.meta
@@ -0,0 +1,91 @@
+fileFormatVersion: 2
+guid: 420875c44d7538f4f865319a529fcd95
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 0
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/iOS/libpfxlinkercommon.a b/Assets/Allegorithmic/Plugins/Substance/iOS/libpfxlinkercommon.a
new file mode 100644
index 000000000..956c6a255
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/iOS/libpfxlinkercommon.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e729ecdb816df94552160b72d72d0ec1c87487580b284810b6a33c7b2c70aebf
+size 3106776
diff --git a/Assets/Allegorithmic/Plugins/Substance/iOS/libpfxlinkercommon.a.meta b/Assets/Allegorithmic/Plugins/Substance/iOS/libpfxlinkercommon.a.meta
new file mode 100644
index 000000000..76e5367b7
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/iOS/libpfxlinkercommon.a.meta
@@ -0,0 +1,91 @@
+fileFormatVersion: 2
+guid: 5f788bb09927ca945b986ec5d0210f39
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 0
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_framework.a b/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_framework.a
new file mode 100644
index 000000000..3c321d30c
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_framework.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7d12a20e401c2b92e43add1f59c262f0eea7add01c4c30250fc156793b103fb
+size 5896112
diff --git a/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_framework.a.meta b/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_framework.a.meta
new file mode 100644
index 000000000..8c9d162a0
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_framework.a.meta
@@ -0,0 +1,91 @@
+fileFormatVersion: 2
+guid: 87bbb6c42a3069344bad413b656484c6
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 0
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_linker.a b/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_linker.a
new file mode 100644
index 000000000..d894d6d33
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_linker.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e1d06648f38f5235e5afc0d8f254a64bb96d472cc9b9d6b388a803bd82fde37c
+size 447432
diff --git a/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_linker.a.meta b/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_linker.a.meta
new file mode 100644
index 000000000..b6f8707f6
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_linker.a.meta
@@ -0,0 +1,91 @@
+fileFormatVersion: 2
+guid: 4f0d78a6bc6293f4cbefeba20637347d
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 0
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_neon_blend.a b/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_neon_blend.a
new file mode 100644
index 000000000..b420ef0f7
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_neon_blend.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9142f0fe7d36b6486406db26d3410c8e1f5a18160241eb15f3fe78bb724da4f8
+size 8460760
diff --git a/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_neon_blend.a.meta b/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_neon_blend.a.meta
new file mode 100644
index 000000000..9c38d025c
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/iOS/libsubstance_neon_blend.a.meta
@@ -0,0 +1,91 @@
+fileFormatVersion: 2
+guid: fac69496faf1a9340b901ab814ea620e
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 0
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/Substance/iOS/libtinyxml.a b/Assets/Allegorithmic/Plugins/Substance/iOS/libtinyxml.a
new file mode 100644
index 000000000..3d8627483
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/iOS/libtinyxml.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:13719b3e825e94835290328a05636def23f16f15c48b646b56323ded2bced20b
+size 440640
diff --git a/Assets/Allegorithmic/Plugins/Substance/iOS/libtinyxml.a.meta b/Assets/Allegorithmic/Plugins/Substance/iOS/libtinyxml.a.meta
new file mode 100644
index 000000000..c38623314
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/Substance/iOS/libtinyxml.a.meta
@@ -0,0 +1,91 @@
+fileFormatVersion: 2
+guid: c6fd2854b42b7ad4a9c691099186720f
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 0
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/engine_build_info.txt b/Assets/Allegorithmic/Plugins/engine_build_info.txt
new file mode 100644
index 000000000..6de05cf89
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/engine_build_info.txt
@@ -0,0 +1,4 @@
+Build Number: 118
+Commit Hash: 2b1f4be3a8d28d44dc5ce59eff39c91144368d60
+Plugin Commit: 9183 
+Plugin Build: A8 
diff --git a/Assets/Allegorithmic/Plugins/engine_build_info.txt.meta b/Assets/Allegorithmic/Plugins/engine_build_info.txt.meta
new file mode 100644
index 000000000..242ccb490
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/engine_build_info.txt.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9a776e087f0eaef46a575b9638d36f3b
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/libSubstance.Engine.so b/Assets/Allegorithmic/Plugins/libSubstance.Engine.so
new file mode 100644
index 000000000..6737dffae
Binary files /dev/null and b/Assets/Allegorithmic/Plugins/libSubstance.Engine.so differ
diff --git a/Assets/Allegorithmic/Plugins/libSubstance.Engine.so.meta b/Assets/Allegorithmic/Plugins/libSubstance.Engine.so.meta
new file mode 100644
index 000000000..c293046df
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/libSubstance.Engine.so.meta
@@ -0,0 +1,27 @@
+fileFormatVersion: 2
+guid: fe110c7cc933b2f4caa38ba097f01093
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/libsubstance_sse2_blend.bundle b/Assets/Allegorithmic/Plugins/libsubstance_sse2_blend.bundle
new file mode 100644
index 000000000..5653b4dc1
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/libsubstance_sse2_blend.bundle
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0adc97aa80dc99fb6ffb1338608e57adec6b94644745a5c0a4045400c7895255
+size 862932
diff --git a/Assets/Allegorithmic/Plugins/libsubstance_sse2_blend.bundle.meta b/Assets/Allegorithmic/Plugins/libsubstance_sse2_blend.bundle.meta
new file mode 100644
index 000000000..bdc0c7de1
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/libsubstance_sse2_blend.bundle.meta
@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: 6b8c054bbe253484a94af93e599c4f1f
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/libsubstance_sse2_blend.so b/Assets/Allegorithmic/Plugins/libsubstance_sse2_blend.so
new file mode 100644
index 000000000..d35f7cb3c
Binary files /dev/null and b/Assets/Allegorithmic/Plugins/libsubstance_sse2_blend.so differ
diff --git a/Assets/Allegorithmic/Plugins/libsubstance_sse2_blend.so.meta b/Assets/Allegorithmic/Plugins/libsubstance_sse2_blend.so.meta
new file mode 100644
index 000000000..21d608259
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/libsubstance_sse2_blend.so.meta
@@ -0,0 +1,27 @@
+fileFormatVersion: 2
+guid: 16ad3d35b0fd5c94b836f884519c3d06
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Allegorithmic/Plugins/substance_sse2_blend.dll b/Assets/Allegorithmic/Plugins/substance_sse2_blend.dll
new file mode 100644
index 000000000..404785493
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/substance_sse2_blend.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32b5e9b391fa04cb2165d020dc355f222c8c31300084aa7c443640fc03f22fce
+size 894976
diff --git a/Assets/Allegorithmic/Plugins/substance_sse2_blend.dll.meta b/Assets/Allegorithmic/Plugins/substance_sse2_blend.dll.meta
new file mode 100644
index 000000000..470277cec
--- /dev/null
+++ b/Assets/Allegorithmic/Plugins/substance_sse2_blend.dll.meta
@@ -0,0 +1,27 @@
+fileFormatVersion: 2
+guid: a87d0544a9f24d2458904bd85d5da155
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FitToCamera.cs b/Assets/FitToCamera.cs
new file mode 100644
index 000000000..dbc70d292
--- /dev/null
+++ b/Assets/FitToCamera.cs
@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class FitToCamera : MonoBehaviour
+{
+    public Camera Camera;
+
+    void Update()
+    {
+        transform.localScale = Camera.orthographicSize * 2 * Vector3.one;
+    }
+}
diff --git a/Assets/FitToCamera.cs.meta b/Assets/FitToCamera.cs.meta
new file mode 100644
index 000000000..c66be04f8
--- /dev/null
+++ b/Assets/FitToCamera.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ab5a36d7c56c02b448b17592b3ab8857
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Materials/Glass.mat b/Assets/Materials/Glass.mat
new file mode 100644
index 000000000..dbddb2a92
--- /dev/null
+++ b/Assets/Materials/Glass.mat
@@ -0,0 +1,79 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Glass
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 1
+    - _Glossiness: 1
+    - _GlossyReflections: 1
+    - _Metallic: 0.47
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Materials/Glass.mat.meta b/Assets/Materials/Glass.mat.meta
new file mode 100644
index 000000000..feb2936e1
--- /dev/null
+++ b/Assets/Materials/Glass.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 761295ee40506ed489244e2dd3b73158
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Materials/Headlights.mat b/Assets/Materials/Headlights.mat
new file mode 100644
index 000000000..350222dbb
--- /dev/null
+++ b/Assets/Materials/Headlights.mat
@@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Headlights
+  m_Shader: {fileID: 4800000, guid: d69ef48273708ef4680762f5cdcfc860, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpPower: 1
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _Emission: 50
+    - _EmissionFresnel: 0.46
+    - _EmissionRoughnessFresnelPower: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.3
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _ReverseRim: 0
+    - _Rotation: 0
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.9417937, g: 1, b: 0.816, a: 1}
+    - _EmissionColor: {r: 0.5613208, g: 0.8890659, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Materials/Headlights.mat.meta b/Assets/Materials/Headlights.mat.meta
new file mode 100644
index 000000000..9780cc1d4
--- /dev/null
+++ b/Assets/Materials/Headlights.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b9036e605cc538943a8c7bec97257e87
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Materials/Radiators.mat b/Assets/Materials/Radiators.mat
new file mode 100644
index 000000000..05763d06d
--- /dev/null
+++ b/Assets/Materials/Radiators.mat
@@ -0,0 +1,87 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Radiators
+  m_Shader: {fileID: 4800000, guid: d69ef48273708ef4680762f5cdcfc860, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: -812895718602229137, guid: b7e648471e9dfc44490bd41973711541,
+          type: 3}
+        m_Scale: {x: 8, y: 8}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: -6057190860509678031, guid: 2b42584452fe0cc4fa4e8a115230b156,
+          type: 3}
+        m_Scale: {x: 8, y: 8}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: -894214952450941493, guid: 2b42584452fe0cc4fa4e8a115230b156,
+          type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpPower: 2
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _Emission: 15
+    - _EmissionFresnel: 4
+    - _EmissionRoughnessFresnelPower: 0.5
+    - _GlossMapScale: 1
+    - _Glossiness: 1
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _ReverseRim: 0
+    - _Rotation: 0
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 1, g: 0.40135294, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Materials/Radiators.mat.meta b/Assets/Materials/Radiators.mat.meta
new file mode 100644
index 000000000..dae629b50
--- /dev/null
+++ b/Assets/Materials/Radiators.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a76a85450aa271448a72b7dfeec9ff53
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Materials/Substance.meta b/Assets/Materials/Substance.meta
new file mode 100644
index 000000000..c6926c786
--- /dev/null
+++ b/Assets/Materials/Substance.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7de1c11cf7591ec48bdb53e9818172f5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Materials/Substance/Metal.meta b/Assets/Materials/Substance/Metal.meta
new file mode 100644
index 000000000..e8c0226e7
--- /dev/null
+++ b/Assets/Materials/Substance/Metal.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 09aee558716a08d4c9806b9b4273a209
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Materials/Substance/Metal/chipped_paint_corrugated_plates.sbsar b/Assets/Materials/Substance/Metal/chipped_paint_corrugated_plates.sbsar
new file mode 100644
index 000000000..3563b67d9
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/chipped_paint_corrugated_plates.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e2084ca79f1f0b6b2cc6aa0e6b2d9e071c393419a42b57b08a1a70cc19c8ebf
+size 19543
diff --git a/Assets/Materials/Substance/Metal/chipped_paint_corrugated_plates.sbsar.meta b/Assets/Materials/Substance/Metal/chipped_paint_corrugated_plates.sbsar.meta
new file mode 100644
index 000000000..1b5cba198
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/chipped_paint_corrugated_plates.sbsar.meta
@@ -0,0 +1,293 @@
+fileFormatVersion: 2
+guid: 9d7cb2cc50fcb9b4ba303809fb750adb
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Chipped Paint Corrugated Plates
+    prototypeName: Chipped Paint Corrugated Plates
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://chipped_paint_corrugated_plates\" label=\"\"
+      >\n  <presetinput identifier=\"$outputsize\" uid=\"3255102554\" type=\"8\"
+      value=\"9,9\" />\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -8115931508426250625, guid: 9d7cb2cc50fcb9b4ba303809fb750adb,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 6920403561712322068, guid: 9d7cb2cc50fcb9b4ba303809fb750adb,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 2850722243375404239, guid: 9d7cb2cc50fcb9b4ba303809fb750adb,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -7481545236578284659, guid: 9d7cb2cc50fcb9b4ba303809fb750adb,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 6822967229916333247, guid: 9d7cb2cc50fcb9b4ba303809fb750adb,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambientocclusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Chipped Paint Corrugated Plates - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Chipped Paint Corrugated Plates - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Chipped Paint Corrugated Plates - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Chipped Paint Corrugated Plates - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Chipped Paint Corrugated Plates - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Chipped Paint Corrugated Plates - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Chipped Paint Corrugated Plates - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Chipped Paint Corrugated Plates - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Chipped Paint Corrugated Plates - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 512
+      textureHeight: 512
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 3453379269681782583, guid: 9d7cb2cc50fcb9b4ba303809fb750adb,
+      type: 3}
+    generatedTextures:
+    - {fileID: 6920403561712322068, guid: 9d7cb2cc50fcb9b4ba303809fb750adb, type: 3}
+    - {fileID: -8115931508426250625, guid: 9d7cb2cc50fcb9b4ba303809fb750adb, type: 3}
+    - {fileID: 2850722243375404239, guid: 9d7cb2cc50fcb9b4ba303809fb750adb, type: 3}
+    - {fileID: 6822967229916333247, guid: 9d7cb2cc50fcb9b4ba303809fb750adb, type: 3}
+    - {fileID: -7481545236578284659, guid: 9d7cb2cc50fcb9b4ba303809fb750adb, type: 3}
diff --git a/Assets/Materials/Substance/Metal/dirty_corrugated_metal_plates.sbsar b/Assets/Materials/Substance/Metal/dirty_corrugated_metal_plates.sbsar
new file mode 100644
index 000000000..cf0872bf0
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/dirty_corrugated_metal_plates.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e4dbc22b75499655267679fd250dc16ad98654757ffe1ce882681c3e40eecbe
+size 21727
diff --git a/Assets/Materials/Substance/Metal/dirty_corrugated_metal_plates.sbsar.meta b/Assets/Materials/Substance/Metal/dirty_corrugated_metal_plates.sbsar.meta
new file mode 100644
index 000000000..69effdddc
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/dirty_corrugated_metal_plates.sbsar.meta
@@ -0,0 +1,293 @@
+fileFormatVersion: 2
+guid: 363e354696e507a42b3ca4742c900b4a
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Dirty Corrugated Metal Plates
+    prototypeName: Dirty Corrugated Metal Plates
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://dirty_corrugated_metal_plates\" label=\"\"
+      >\n  <presetinput identifier=\"$outputsize\" uid=\"1535649831\" type=\"8\"
+      value=\"9,9\" />\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -8826147161399992710, guid: 363e354696e507a42b3ca4742c900b4a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -4254172196237805714, guid: 363e354696e507a42b3ca4742c900b4a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -178087581530589431, guid: 363e354696e507a42b3ca4742c900b4a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -6851646934926143366, guid: 363e354696e507a42b3ca4742c900b4a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -8261329850380306815, guid: 363e354696e507a42b3ca4742c900b4a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambientocclusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Dirty Corrugated Metal Plates - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Dirty Corrugated Metal Plates - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Dirty Corrugated Metal Plates - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Dirty Corrugated Metal Plates - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Dirty Corrugated Metal Plates - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Dirty Corrugated Metal Plates - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Dirty Corrugated Metal Plates - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Dirty Corrugated Metal Plates - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Dirty Corrugated Metal Plates - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 512
+      textureHeight: 512
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 1636074653637040140, guid: 363e354696e507a42b3ca4742c900b4a,
+      type: 3}
+    generatedTextures:
+    - {fileID: -4254172196237805714, guid: 363e354696e507a42b3ca4742c900b4a, type: 3}
+    - {fileID: -8826147161399992710, guid: 363e354696e507a42b3ca4742c900b4a, type: 3}
+    - {fileID: -178087581530589431, guid: 363e354696e507a42b3ca4742c900b4a, type: 3}
+    - {fileID: -8261329850380306815, guid: 363e354696e507a42b3ca4742c900b4a, type: 3}
+    - {fileID: -6851646934926143366, guid: 363e354696e507a42b3ca4742c900b4a, type: 3}
diff --git a/Assets/Materials/Substance/Metal/galvanized_001.sbsar b/Assets/Materials/Substance/Metal/galvanized_001.sbsar
new file mode 100644
index 000000000..5d6237210
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/galvanized_001.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:274db26d631b6cd53024c1366c01322d99b6194b5e211d04c5430bb8174ae8f6
+size 8207
diff --git a/Assets/Materials/Substance/Metal/galvanized_001.sbsar.meta b/Assets/Materials/Substance/Metal/galvanized_001.sbsar.meta
new file mode 100644
index 000000000..c79d5f023
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/galvanized_001.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: 2be0f689f5b01be4aa1032bc86f15eab
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: galvanized_001/galvanized_001
+  - first:
+      4: 400000
+    second: galvanized_001/galvanized_001/Transform
+  - first:
+      21: 2100000
+    second: mat.Galvanized_001
+  - first:
+      23: 2300000
+    second: galvanized_001/galvanized_001/MeshRenderer
+  - first:
+      28: 2800000
+    second: Galvanized_001_baseColor
+  - first:
+      28: 2800002
+    second: Galvanized_001_normal
+  - first:
+      28: 2800004
+    second: Galvanized_001_metallic
+  - first:
+      28: 2800006
+    second: Galvanized_001_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Galvanized_001_height
+  - first:
+      33: 3300000
+    second: galvanized_001/galvanized_001/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: galvanized_001/galvanized_001/SphereCollider
+  - first:
+      1001: 100100000
+    second: galvanized_001
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Galvanized_001
+    prototypeName: Galvanized_001
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://galvanized_001\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -2787997366030867252, guid: 2be0f689f5b01be4aa1032bc86f15eab,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 7907137595978400316, guid: 2be0f689f5b01be4aa1032bc86f15eab,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 1034366337303036879, guid: 2be0f689f5b01be4aa1032bc86f15eab,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 4470803051826786927, guid: 2be0f689f5b01be4aa1032bc86f15eab,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -3422293810953865746, guid: 2be0f689f5b01be4aa1032bc86f15eab,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Galvanized_001_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001 - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001 - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001 - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001 - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001 - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001 - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001 - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001 - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Galvanized_001 - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -231086597109407277, guid: 2be0f689f5b01be4aa1032bc86f15eab,
+      type: 3}
+    generatedTextures:
+    - {fileID: 7907137595978400316, guid: 2be0f689f5b01be4aa1032bc86f15eab, type: 3}
+    - {fileID: -2787997366030867252, guid: 2be0f689f5b01be4aa1032bc86f15eab, type: 3}
+    - {fileID: 1034366337303036879, guid: 2be0f689f5b01be4aa1032bc86f15eab, type: 3}
+    - {fileID: 4470803051826786927, guid: 2be0f689f5b01be4aa1032bc86f15eab, type: 3}
+    - {fileID: -3422293810953865746, guid: 2be0f689f5b01be4aa1032bc86f15eab, type: 3}
diff --git a/Assets/Materials/Substance/Metal/heavy_rusty_corrugated_panels.sbsar b/Assets/Materials/Substance/Metal/heavy_rusty_corrugated_panels.sbsar
new file mode 100644
index 000000000..0b3e3cb8d
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/heavy_rusty_corrugated_panels.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f184730899134871e645296b862d6b6808c751fcfd5cd3b624609572288098b6
+size 20146
diff --git a/Assets/Materials/Substance/Metal/heavy_rusty_corrugated_panels.sbsar.meta b/Assets/Materials/Substance/Metal/heavy_rusty_corrugated_panels.sbsar.meta
new file mode 100644
index 000000000..73c1ed41d
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/heavy_rusty_corrugated_panels.sbsar.meta
@@ -0,0 +1,293 @@
+fileFormatVersion: 2
+guid: 0ae4384b09e1f294d836563ffb857c4c
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Heavy Rusty Corrugated Panels
+    prototypeName: Heavy Rusty Corrugated Panels
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://heavy_rusty_corrugated_panels\" label=\"\"
+      >\n  <presetinput identifier=\"$outputsize\" uid=\"1917447019\" type=\"8\"
+      value=\"9,9\" />\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 3826582212562153731, guid: 0ae4384b09e1f294d836563ffb857c4c,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -3195120850145922453, guid: 0ae4384b09e1f294d836563ffb857c4c,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 499149941402596675, guid: 0ae4384b09e1f294d836563ffb857c4c,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 3923575771939661868, guid: 0ae4384b09e1f294d836563ffb857c4c,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 2800206778028213661, guid: 0ae4384b09e1f294d836563ffb857c4c,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambientocclusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Heavy Rusty Corrugated Panels - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Heavy Rusty Corrugated Panels - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Heavy Rusty Corrugated Panels - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Heavy Rusty Corrugated Panels - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Heavy Rusty Corrugated Panels - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Heavy Rusty Corrugated Panels - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Heavy Rusty Corrugated Panels - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Heavy Rusty Corrugated Panels - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Heavy Rusty Corrugated Panels - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 512
+      textureHeight: 512
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -7731743013952503560, guid: 0ae4384b09e1f294d836563ffb857c4c,
+      type: 3}
+    generatedTextures:
+    - {fileID: -3195120850145922453, guid: 0ae4384b09e1f294d836563ffb857c4c, type: 3}
+    - {fileID: 3826582212562153731, guid: 0ae4384b09e1f294d836563ffb857c4c, type: 3}
+    - {fileID: 499149941402596675, guid: 0ae4384b09e1f294d836563ffb857c4c, type: 3}
+    - {fileID: 2800206778028213661, guid: 0ae4384b09e1f294d836563ffb857c4c, type: 3}
+    - {fileID: 3923575771939661868, guid: 0ae4384b09e1f294d836563ffb857c4c, type: 3}
diff --git a/Assets/Materials/Substance/Metal/iron_damaged.sbsar b/Assets/Materials/Substance/Metal/iron_damaged.sbsar
new file mode 100644
index 000000000..cb09572e5
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/iron_damaged.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a12de208077d6dfd8e70dfa8a8976bb9e5b2ca2d258bb34aa50c81a58a6451c
+size 30808
diff --git a/Assets/Materials/Substance/Metal/iron_damaged.sbsar.meta b/Assets/Materials/Substance/Metal/iron_damaged.sbsar.meta
new file mode 100644
index 000000000..f443c3a1a
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/iron_damaged.sbsar.meta
@@ -0,0 +1,293 @@
+fileFormatVersion: 2
+guid: d15fc45ed0000934d946b5f271f637ef
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Iron Damaged
+    prototypeName: Iron Damaged
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://iron_damaged\" label=\"\" >\n  <presetinput
+      identifier=\"$outputsize\" uid=\"1484747668\" type=\"8\" value=\"9,9\" />\n
+      </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -1855041196637152199, guid: d15fc45ed0000934d946b5f271f637ef,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -2789335455068261637, guid: d15fc45ed0000934d946b5f271f637ef,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 7922211451800446260, guid: d15fc45ed0000934d946b5f271f637ef,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -4424499752615739725, guid: d15fc45ed0000934d946b5f271f637ef,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 7474978398744299577, guid: d15fc45ed0000934d946b5f271f637ef,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambientocclusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Iron Damaged - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Iron Damaged - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Iron Damaged - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Iron Damaged - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Iron Damaged - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Iron Damaged - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Iron Damaged - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Iron Damaged - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Iron Damaged - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 512
+      textureHeight: 512
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 1736733470071950104, guid: d15fc45ed0000934d946b5f271f637ef,
+      type: 3}
+    generatedTextures:
+    - {fileID: -2789335455068261637, guid: d15fc45ed0000934d946b5f271f637ef, type: 3}
+    - {fileID: -1855041196637152199, guid: d15fc45ed0000934d946b5f271f637ef, type: 3}
+    - {fileID: 7922211451800446260, guid: d15fc45ed0000934d946b5f271f637ef, type: 3}
+    - {fileID: 7474978398744299577, guid: d15fc45ed0000934d946b5f271f637ef, type: 3}
+    - {fileID: -4424499752615739725, guid: d15fc45ed0000934d946b5f271f637ef, type: 3}
diff --git a/Assets/Materials/Substance/Metal/iron_rugged.sbsar b/Assets/Materials/Substance/Metal/iron_rugged.sbsar
new file mode 100644
index 000000000..d211f88ad
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/iron_rugged.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5f2bc787cbb3f6511050a4faddaa07077bf54814131752687ed3717914d77de5
+size 28930
diff --git a/Assets/Materials/Substance/Metal/iron_rugged.sbsar.meta b/Assets/Materials/Substance/Metal/iron_rugged.sbsar.meta
new file mode 100644
index 000000000..4fadc9424
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/iron_rugged.sbsar.meta
@@ -0,0 +1,293 @@
+fileFormatVersion: 2
+guid: afbd691d0ea2a5a47b5a43b244593a56
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Iron Rugged
+    prototypeName: Iron Rugged
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://iron_rugged\" label=\"\" >\n  <presetinput
+      identifier=\"$outputsize\" uid=\"780426713\" type=\"8\" value=\"9,9\" />\n
+      </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -2323688274092838296, guid: afbd691d0ea2a5a47b5a43b244593a56,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -3909611376798458227, guid: afbd691d0ea2a5a47b5a43b244593a56,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -1417795912608492100, guid: afbd691d0ea2a5a47b5a43b244593a56,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -7795300588429949130, guid: afbd691d0ea2a5a47b5a43b244593a56,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 3868076301887189615, guid: afbd691d0ea2a5a47b5a43b244593a56,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambientocclusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Iron Rugged - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Iron Rugged - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Iron Rugged - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Iron Rugged - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Iron Rugged - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Iron Rugged - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Iron Rugged - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Iron Rugged - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Iron Rugged - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 512
+      textureHeight: 512
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -7894845242109240131, guid: afbd691d0ea2a5a47b5a43b244593a56,
+      type: 3}
+    generatedTextures:
+    - {fileID: -3909611376798458227, guid: afbd691d0ea2a5a47b5a43b244593a56, type: 3}
+    - {fileID: -2323688274092838296, guid: afbd691d0ea2a5a47b5a43b244593a56, type: 3}
+    - {fileID: -1417795912608492100, guid: afbd691d0ea2a5a47b5a43b244593a56, type: 3}
+    - {fileID: 3868076301887189615, guid: afbd691d0ea2a5a47b5a43b244593a56, type: 3}
+    - {fileID: -7795300588429949130, guid: afbd691d0ea2a5a47b5a43b244593a56, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_002.sbsar b/Assets/Materials/Substance/Metal/metal_002.sbsar
new file mode 100644
index 000000000..97dcc5ffe
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_002.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9282e9326add2015fd2748e98c38062e438b085036eae00825551986e30d002f
+size 11670
diff --git a/Assets/Materials/Substance/Metal/metal_002.sbsar.meta b/Assets/Materials/Substance/Metal/metal_002.sbsar.meta
new file mode 100644
index 000000000..b491d1c2c
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_002.sbsar.meta
@@ -0,0 +1,372 @@
+fileFormatVersion: 2
+guid: 2b42584452fe0cc4fa4e8a115230b156
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_002/metal_002
+  - first:
+      4: 400000
+    second: metal_002/metal_002/Transform
+  - first:
+      21: 2100000
+    second: mat.Metal 002
+  - first:
+      23: 2300000
+    second: metal_002/metal_002/MeshRenderer
+  - first:
+      28: 2800000
+    second: Metal 002_baseColor
+  - first:
+      28: 2800002
+    second: Metal 002_normal
+  - first:
+      28: 2800004
+    second: Metal 002_metallic
+  - first:
+      28: 2800006
+    second: Metal 002_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Metal 002_height
+  - first:
+      33: 3300000
+    second: metal_002/metal_002/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_002/metal_002/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_002
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Metal 002
+    prototypeName: Metal 002
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_002\" label=\"\" >\n  <presetinput
+      identifier=\"deep_rust\" uid=\"428347714\" type=\"0\" value=\"0.49\" />\n 
+      <presetinput identifier=\"rust\" uid=\"428349112\" type=\"0\" value=\"0.83\"
+      />\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 1550000119726971649, guid: 2b42584452fe0cc4fa4e8a115230b156,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -6057190860509678031, guid: 2b42584452fe0cc4fa4e8a115230b156,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -894214952450941493, guid: 2b42584452fe0cc4fa4e8a115230b156,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -6882973941229436791, guid: 2b42584452fe0cc4fa4e8a115230b156,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 6347190432477724635, guid: 2b42584452fe0cc4fa4e8a115230b156,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Metal 002_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002 - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002 - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002 - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002 - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002 - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002 - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002 - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002 - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 002 - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 3766318789785789000, guid: 2b42584452fe0cc4fa4e8a115230b156,
+      type: 3}
+    generatedTextures:
+    - {fileID: -6057190860509678031, guid: 2b42584452fe0cc4fa4e8a115230b156, type: 3}
+    - {fileID: 1550000119726971649, guid: 2b42584452fe0cc4fa4e8a115230b156, type: 3}
+    - {fileID: -894214952450941493, guid: 2b42584452fe0cc4fa4e8a115230b156, type: 3}
+    - {fileID: -6882973941229436791, guid: 2b42584452fe0cc4fa4e8a115230b156, type: 3}
+    - {fileID: 6347190432477724635, guid: 2b42584452fe0cc4fa4e8a115230b156, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_003.sbsar b/Assets/Materials/Substance/Metal/metal_003.sbsar
new file mode 100644
index 000000000..bbc118a2d
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_003.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ef8ee0ce61d17b7c84433ea0f780f32609c81f580f2c7d3a9c78303b9051a47
+size 7739
diff --git a/Assets/Materials/Substance/Metal/metal_003.sbsar.meta b/Assets/Materials/Substance/Metal/metal_003.sbsar.meta
new file mode 100644
index 000000000..ec79c0792
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_003.sbsar.meta
@@ -0,0 +1,372 @@
+fileFormatVersion: 2
+guid: 885e680924fc12c439a842a2142d4b78
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_003/metal_003
+  - first:
+      4: 400000
+    second: metal_003/metal_003/Transform
+  - first:
+      21: 2100000
+    second: mat.Metal 003
+  - first:
+      23: 2300000
+    second: metal_003/metal_003/MeshRenderer
+  - first:
+      28: 2800000
+    second: Metal 003_baseColor
+  - first:
+      28: 2800002
+    second: Metal 003_normal
+  - first:
+      28: 2800004
+    second: Metal 003_metallic
+  - first:
+      28: 2800006
+    second: Metal 003_height
+  - first:
+      28: 2800008
+    second: Metal 003_ambientOcclusion
+  - first:
+      33: 3300000
+    second: metal_003/metal_003/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_003/metal_003/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_003
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Metal 003
+    prototypeName: Metal 003
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_003\" label=\"\" >\n  <presetinput
+      identifier=\"$outputsize\" uid=\"1810375239\" type=\"8\" value=\"10,10\" />\n 
+      <presetinput identifier=\"age\" uid=\"288263018\" type=\"0\" value=\"0.592\"
+      />\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -2508943184622041221, guid: 885e680924fc12c439a842a2142d4b78,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -1236254257114565538, guid: 885e680924fc12c439a842a2142d4b78,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 4019402794555593307, guid: 885e680924fc12c439a842a2142d4b78,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -1475328947160444094, guid: 885e680924fc12c439a842a2142d4b78,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 7523010977671448217, guid: 885e680924fc12c439a842a2142d4b78,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Metal 003_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003 - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003 - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003 - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003 - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003 - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003 - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003 - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003 - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 003 - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 1024
+      textureHeight: 1024
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -741235592913766832, guid: 885e680924fc12c439a842a2142d4b78,
+      type: 3}
+    generatedTextures:
+    - {fileID: -1236254257114565538, guid: 885e680924fc12c439a842a2142d4b78, type: 3}
+    - {fileID: -2508943184622041221, guid: 885e680924fc12c439a842a2142d4b78, type: 3}
+    - {fileID: 4019402794555593307, guid: 885e680924fc12c439a842a2142d4b78, type: 3}
+    - {fileID: 7523010977671448217, guid: 885e680924fc12c439a842a2142d4b78, type: 3}
+    - {fileID: -1475328947160444094, guid: 885e680924fc12c439a842a2142d4b78, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_006.sbsar b/Assets/Materials/Substance/Metal/metal_006.sbsar
new file mode 100644
index 000000000..ac614998f
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_006.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c7cdd662d4c7ee3124366ac316fe6aa5dd247c279bba053a9084916e0510d8df
+size 12109
diff --git a/Assets/Materials/Substance/Metal/metal_006.sbsar.meta b/Assets/Materials/Substance/Metal/metal_006.sbsar.meta
new file mode 100644
index 000000000..fdc9e35f6
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_006.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: 53adf8e53222e6f4791d7bf2110fb70c
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_006/metal_006
+  - first:
+      4: 400000
+    second: metal_006/metal_006/Transform
+  - first:
+      21: 2100000
+    second: mat.Metal 006
+  - first:
+      23: 2300000
+    second: metal_006/metal_006/MeshRenderer
+  - first:
+      28: 2800000
+    second: Metal 006_baseColor
+  - first:
+      28: 2800002
+    second: Metal 006_normal
+  - first:
+      28: 2800004
+    second: Metal 006_metallic
+  - first:
+      28: 2800006
+    second: Metal 006_height
+  - first:
+      28: 2800008
+    second: Metal 006_ambientOcclusion
+  - first:
+      33: 3300000
+    second: metal_006/metal_006/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_006/metal_006/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_006
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Metal 006
+    prototypeName: Metal 006
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_006\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -9145106948908842110, guid: 53adf8e53222e6f4791d7bf2110fb70c,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 8714526317094329886, guid: 53adf8e53222e6f4791d7bf2110fb70c,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 8283496261199770474, guid: 53adf8e53222e6f4791d7bf2110fb70c,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -247870979206812949, guid: 53adf8e53222e6f4791d7bf2110fb70c,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 4895182546727821380, guid: 53adf8e53222e6f4791d7bf2110fb70c,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Metal 006_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006 - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006 - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006 - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006 - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006 - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006 - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006 - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006 - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal 006 - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 3954565982357225544, guid: 53adf8e53222e6f4791d7bf2110fb70c,
+      type: 3}
+    generatedTextures:
+    - {fileID: 8714526317094329886, guid: 53adf8e53222e6f4791d7bf2110fb70c, type: 3}
+    - {fileID: -9145106948908842110, guid: 53adf8e53222e6f4791d7bf2110fb70c, type: 3}
+    - {fileID: 8283496261199770474, guid: 53adf8e53222e6f4791d7bf2110fb70c, type: 3}
+    - {fileID: 4895182546727821380, guid: 53adf8e53222e6f4791d7bf2110fb70c, type: 3}
+    - {fileID: -247870979206812949, guid: 53adf8e53222e6f4791d7bf2110fb70c, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_aluminium.sbsar b/Assets/Materials/Substance/Metal/metal_aluminium.sbsar
new file mode 100644
index 000000000..088b73bee
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_aluminium.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b19246651deb85c3c0a8d424507e0711ccce8c9eae241da396a36cd210f38f20
+size 10491
diff --git a/Assets/Materials/Substance/Metal/metal_aluminium.sbsar.meta b/Assets/Materials/Substance/Metal/metal_aluminium.sbsar.meta
new file mode 100644
index 000000000..d45a1291d
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_aluminium.sbsar.meta
@@ -0,0 +1,373 @@
+fileFormatVersion: 2
+guid: 6b2eb94965ca27542b8627d3521f5b5b
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_aluminium/metal_aluminium
+  - first:
+      4: 400000
+    second: metal_aluminium/metal_aluminium/Transform
+  - first:
+      21: 2100000
+    second: mat.Aluminium
+  - first:
+      23: 2300000
+    second: metal_aluminium/metal_aluminium/MeshRenderer
+  - first:
+      28: 2800000
+    second: Aluminium_baseColor
+  - first:
+      28: 2800002
+    second: Aluminium_normal
+  - first:
+      28: 2800004
+    second: Aluminium_metallic
+  - first:
+      28: 2800006
+    second: Aluminium_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Aluminium_height
+  - first:
+      33: 3300000
+    second: metal_aluminium/metal_aluminium/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_aluminium/metal_aluminium/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_aluminium
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Aluminium
+    prototypeName: Aluminium
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_aluminium\" label=\"\" >\n  <presetinput
+      identifier=\"$outputsize\" uid=\"3181072216\" type=\"8\" value=\"9,9\" />\n 
+      <presetinput identifier=\"dirt\" uid=\"3098331086\" type=\"0\" value=\"0.47\"
+      />\n  <presetinput identifier=\"scratches\" uid=\"3338933642\" type=\"0\" value=\"1\"
+      />\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -7227111979962756822, guid: 6b2eb94965ca27542b8627d3521f5b5b,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 5122202571912407749, guid: 6b2eb94965ca27542b8627d3521f5b5b,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -5067940305606501900, guid: 6b2eb94965ca27542b8627d3521f5b5b,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 9049458111962441826, guid: 6b2eb94965ca27542b8627d3521f5b5b,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -7751791800289965735, guid: 6b2eb94965ca27542b8627d3521f5b5b,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Aluminium_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 512
+      textureHeight: 512
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 2717629391965333470, guid: 6b2eb94965ca27542b8627d3521f5b5b,
+      type: 3}
+    generatedTextures:
+    - {fileID: 5122202571912407749, guid: 6b2eb94965ca27542b8627d3521f5b5b, type: 3}
+    - {fileID: -7227111979962756822, guid: 6b2eb94965ca27542b8627d3521f5b5b, type: 3}
+    - {fileID: -5067940305606501900, guid: 6b2eb94965ca27542b8627d3521f5b5b, type: 3}
+    - {fileID: 9049458111962441826, guid: 6b2eb94965ca27542b8627d3521f5b5b, type: 3}
+    - {fileID: -7751791800289965735, guid: 6b2eb94965ca27542b8627d3521f5b5b, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_aluminium_brushed.sbsar b/Assets/Materials/Substance/Metal/metal_aluminium_brushed.sbsar
new file mode 100644
index 000000000..7f2ec6e98
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_aluminium_brushed.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:41bfd12f87e8255f00383022aa8a1d0c83273a8a23e21233db9f8f08eb89738f
+size 12223
diff --git a/Assets/Materials/Substance/Metal/metal_aluminium_brushed.sbsar.meta b/Assets/Materials/Substance/Metal/metal_aluminium_brushed.sbsar.meta
new file mode 100644
index 000000000..61e018847
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_aluminium_brushed.sbsar.meta
@@ -0,0 +1,373 @@
+fileFormatVersion: 2
+guid: 06d6a565d43fba5409712ce9a10bfbef
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_aluminium_brushed/metal_aluminium_brushed
+  - first:
+      4: 400000
+    second: metal_aluminium_brushed/metal_aluminium_brushed/Transform
+  - first:
+      21: 2100000
+    second: mat.Aluminium brushed
+  - first:
+      23: 2300000
+    second: metal_aluminium_brushed/metal_aluminium_brushed/MeshRenderer
+  - first:
+      28: 2800000
+    second: Aluminium brushed_baseColor
+  - first:
+      28: 2800002
+    second: Aluminium brushed_normal
+  - first:
+      28: 2800004
+    second: Aluminium brushed_metallic
+  - first:
+      28: 2800006
+    second: Aluminium brushed_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Aluminium brushed_height
+  - first:
+      33: 3300000
+    second: metal_aluminium_brushed/metal_aluminium_brushed/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_aluminium_brushed/metal_aluminium_brushed/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_aluminium_brushed
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Aluminium brushed
+    prototypeName: Aluminium brushed
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_aluminium_brushed\" label=\"\" >\n 
+      <presetinput identifier=\"$outputsize\" uid=\"2569318558\" type=\"8\" value=\"9,9\"
+      />\n  <presetinput identifier=\"scratches\" uid=\"3820743244\" type=\"0\" value=\"1\"
+      />\n  <presetinput identifier=\"aluminium_color\" uid=\"3822108404\" type=\"2\"
+      value=\"0.951,0.951,0.951\" />\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 4730978449518085612, guid: 06d6a565d43fba5409712ce9a10bfbef,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 7556082237344091230, guid: 06d6a565d43fba5409712ce9a10bfbef,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 6373266012617290493, guid: 06d6a565d43fba5409712ce9a10bfbef,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 342959783478273704, guid: 06d6a565d43fba5409712ce9a10bfbef,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -9132138291289375396, guid: 06d6a565d43fba5409712ce9a10bfbef,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Aluminium brushed_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Aluminium brushed - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 512
+      textureHeight: 512
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -5899741495057040748, guid: 06d6a565d43fba5409712ce9a10bfbef,
+      type: 3}
+    generatedTextures:
+    - {fileID: 7556082237344091230, guid: 06d6a565d43fba5409712ce9a10bfbef, type: 3}
+    - {fileID: 4730978449518085612, guid: 06d6a565d43fba5409712ce9a10bfbef, type: 3}
+    - {fileID: 6373266012617290493, guid: 06d6a565d43fba5409712ce9a10bfbef, type: 3}
+    - {fileID: 342959783478273704, guid: 06d6a565d43fba5409712ce9a10bfbef, type: 3}
+    - {fileID: -9132138291289375396, guid: 06d6a565d43fba5409712ce9a10bfbef, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_brass.sbsar b/Assets/Materials/Substance/Metal/metal_brass.sbsar
new file mode 100644
index 000000000..8db7e53b4
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_brass.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:26e440c8cc91202789c408e82dfa3caca98938014aaf63baade897fade94f212
+size 12658
diff --git a/Assets/Materials/Substance/Metal/metal_brass.sbsar.meta b/Assets/Materials/Substance/Metal/metal_brass.sbsar.meta
new file mode 100644
index 000000000..ff1e783aa
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_brass.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: 9fc901afb8a434e46b9405eaec2df5a4
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_brass/metal_brass
+  - first:
+      4: 400000
+    second: metal_brass/metal_brass/Transform
+  - first:
+      21: 2100000
+    second: mat.Brass
+  - first:
+      23: 2300000
+    second: metal_brass/metal_brass/MeshRenderer
+  - first:
+      28: 2800000
+    second: Brass_baseColor
+  - first:
+      28: 2800002
+    second: Brass_normal
+  - first:
+      28: 2800004
+    second: Brass_metallic
+  - first:
+      28: 2800006
+    second: Brass_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Brass_height
+  - first:
+      33: 3300000
+    second: metal_brass/metal_brass/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_brass/metal_brass/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_brass
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Brass
+    prototypeName: Brass
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_brass\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -3419035557588562233, guid: 9fc901afb8a434e46b9405eaec2df5a4,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -1863473678134789185, guid: 9fc901afb8a434e46b9405eaec2df5a4,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 6214616473909614744, guid: 9fc901afb8a434e46b9405eaec2df5a4,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -3436886866959827803, guid: 9fc901afb8a434e46b9405eaec2df5a4,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 7009887839391554354, guid: 9fc901afb8a434e46b9405eaec2df5a4,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Brass_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Brass - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -4907982557009795279, guid: 9fc901afb8a434e46b9405eaec2df5a4,
+      type: 3}
+    generatedTextures:
+    - {fileID: -1863473678134789185, guid: 9fc901afb8a434e46b9405eaec2df5a4, type: 3}
+    - {fileID: -3419035557588562233, guid: 9fc901afb8a434e46b9405eaec2df5a4, type: 3}
+    - {fileID: 6214616473909614744, guid: 9fc901afb8a434e46b9405eaec2df5a4, type: 3}
+    - {fileID: -3436886866959827803, guid: 9fc901afb8a434e46b9405eaec2df5a4, type: 3}
+    - {fileID: 7009887839391554354, guid: 9fc901afb8a434e46b9405eaec2df5a4, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_car_paint.sbsar b/Assets/Materials/Substance/Metal/metal_car_paint.sbsar
new file mode 100644
index 000000000..963310406
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_car_paint.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dbee14b278a03ed59e1df8ecd6ba2b07ab7c2b2089e5e2bc3fad5673694a9f03
+size 14971
diff --git a/Assets/Materials/Substance/Metal/metal_car_paint.sbsar.meta b/Assets/Materials/Substance/Metal/metal_car_paint.sbsar.meta
new file mode 100644
index 000000000..a70e18d65
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_car_paint.sbsar.meta
@@ -0,0 +1,379 @@
+fileFormatVersion: 2
+guid: b2bec4b400153d745b2915f1c43e5c96
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_car_paint/metal_car_paint
+  - first:
+      4: 400000
+    second: metal_car_paint/metal_car_paint/Transform
+  - first:
+      21: 2100000
+    second: mat.Car paint
+  - first:
+      23: 2300000
+    second: metal_car_paint/metal_car_paint/MeshRenderer
+  - first:
+      28: 2800000
+    second: Car paint_baseColor
+  - first:
+      28: 2800002
+    second: Car paint_normal
+  - first:
+      28: 2800004
+    second: Car paint_metallic
+  - first:
+      28: 2800006
+    second: Car paint_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Car paint_height
+  - first:
+      33: 3300000
+    second: metal_car_paint/metal_car_paint/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_car_paint/metal_car_paint/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_car_paint
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Car paint
+    prototypeName: Car paint
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_car_paint\" label=\"\" >\n  <presetinput
+      identifier=\"$outputsize\" uid=\"2092133592\" type=\"8\" value=\"10,10\" />\n 
+      <presetinput identifier=\"age\" uid=\"2038752334\" type=\"0\" value=\"0.66\"
+      />\n  <presetinput identifier=\"flakes\" uid=\"20245147\" type=\"4\" value=\"1\"
+      />\n  <presetinput identifier=\"flakes_scale\" uid=\"20192266\" type=\"0\"
+      value=\"0.225\" />\n  <presetinput identifier=\"paint_scratches\" uid=\"22509202\"
+      type=\"0\" value=\"1\" />\n  <presetinput identifier=\"paint_peeling\" uid=\"103560714\"
+      type=\"0\" value=\"0.14\" />\n  <presetinput identifier=\"paint_color\" uid=\"105341618\"
+      type=\"2\" value=\"1,0.891509,0.946396\" />\n  <presetinput identifier=\"paint_roughness\"
+      uid=\"22504606\" type=\"0\" value=\"0.15\" />\n  <presetinput identifier=\"paint_metallic\"
+      uid=\"22503567\" type=\"0\" value=\"0.67\" />\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 3068890721646206586, guid: b2bec4b400153d745b2915f1c43e5c96,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 2, y: 2}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 5917659159057834157, guid: b2bec4b400153d745b2915f1c43e5c96,
+          type: 3}
+        scale: {x: 2, y: 2}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -3552914696322007609, guid: b2bec4b400153d745b2915f1c43e5c96,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -1242281561028671816, guid: b2bec4b400153d745b2915f1c43e5c96,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -1652887728991447519, guid: b2bec4b400153d745b2915f1c43e5c96,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.005
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Car paint_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Car paint - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 1024
+      textureHeight: 1024
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 3720744386649352057, guid: b2bec4b400153d745b2915f1c43e5c96,
+      type: 3}
+    generatedTextures:
+    - {fileID: 5917659159057834157, guid: b2bec4b400153d745b2915f1c43e5c96, type: 3}
+    - {fileID: 3068890721646206586, guid: b2bec4b400153d745b2915f1c43e5c96, type: 3}
+    - {fileID: -3552914696322007609, guid: b2bec4b400153d745b2915f1c43e5c96, type: 3}
+    - {fileID: -1242281561028671816, guid: b2bec4b400153d745b2915f1c43e5c96, type: 3}
+    - {fileID: -1652887728991447519, guid: b2bec4b400153d745b2915f1c43e5c96, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_copper.sbsar b/Assets/Materials/Substance/Metal/metal_copper.sbsar
new file mode 100644
index 000000000..b9eaa9f10
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_copper.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e0b38479a336f09f0f273488c666a1eb025ddd9a65366da00c80179ca0a64ee
+size 7413
diff --git a/Assets/Materials/Substance/Metal/metal_copper.sbsar.meta b/Assets/Materials/Substance/Metal/metal_copper.sbsar.meta
new file mode 100644
index 000000000..cd87324ed
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_copper.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: 8249e9ffcbd97c84d8ce73343e156c82
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_copper/metal_copper
+  - first:
+      4: 400000
+    second: metal_copper/metal_copper/Transform
+  - first:
+      21: 2100000
+    second: mat.Copper
+  - first:
+      23: 2300000
+    second: metal_copper/metal_copper/MeshRenderer
+  - first:
+      28: 2800000
+    second: Copper_baseColor
+  - first:
+      28: 2800002
+    second: Copper_normal
+  - first:
+      28: 2800004
+    second: Copper_metallic
+  - first:
+      28: 2800006
+    second: Copper_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Copper_height
+  - first:
+      33: 3300000
+    second: metal_copper/metal_copper/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_copper/metal_copper/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_copper
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Copper
+    prototypeName: Copper
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_copper\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -3792452219542522299, guid: 8249e9ffcbd97c84d8ce73343e156c82,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -595311359069952391, guid: 8249e9ffcbd97c84d8ce73343e156c82,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -1397886531756242709, guid: 8249e9ffcbd97c84d8ce73343e156c82,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 2236529815293478155, guid: 8249e9ffcbd97c84d8ce73343e156c82,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -1739956823984805281, guid: 8249e9ffcbd97c84d8ce73343e156c82,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Copper_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Copper - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 9219180724257492359, guid: 8249e9ffcbd97c84d8ce73343e156c82,
+      type: 3}
+    generatedTextures:
+    - {fileID: -595311359069952391, guid: 8249e9ffcbd97c84d8ce73343e156c82, type: 3}
+    - {fileID: -3792452219542522299, guid: 8249e9ffcbd97c84d8ce73343e156c82, type: 3}
+    - {fileID: -1397886531756242709, guid: 8249e9ffcbd97c84d8ce73343e156c82, type: 3}
+    - {fileID: 2236529815293478155, guid: 8249e9ffcbd97c84d8ce73343e156c82, type: 3}
+    - {fileID: -1739956823984805281, guid: 8249e9ffcbd97c84d8ce73343e156c82, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_corrugated_002.sbsar b/Assets/Materials/Substance/Metal/metal_corrugated_002.sbsar
new file mode 100644
index 000000000..24237719c
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_corrugated_002.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b798bdf0e774a7d826b7080b18c91ac8000cf6ac617dc395d8cf105aba8d7da
+size 12826
diff --git a/Assets/Materials/Substance/Metal/metal_corrugated_002.sbsar.meta b/Assets/Materials/Substance/Metal/metal_corrugated_002.sbsar.meta
new file mode 100644
index 000000000..28bc8ec54
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_corrugated_002.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: 9d0963470d3545a4e932ed4ea95b9d62
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_corrugated_002/metal_corrugated_002
+  - first:
+      4: 400000
+    second: metal_corrugated_002/metal_corrugated_002/Transform
+  - first:
+      21: 2100000
+    second: mat.Metal Corrugated 002
+  - first:
+      23: 2300000
+    second: metal_corrugated_002/metal_corrugated_002/MeshRenderer
+  - first:
+      28: 2800000
+    second: Metal Corrugated 002_baseColor
+  - first:
+      28: 2800002
+    second: Metal Corrugated 002_normal
+  - first:
+      28: 2800004
+    second: Metal Corrugated 002_metallic
+  - first:
+      28: 2800006
+    second: Metal Corrugated 002_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Metal Corrugated 002_height
+  - first:
+      33: 3300000
+    second: metal_corrugated_002/metal_corrugated_002/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_corrugated_002/metal_corrugated_002/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_corrugated_002
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Metal Corrugated 002
+    prototypeName: Metal Corrugated 002
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_corrugated_002\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -3654691528969531916, guid: 9d0963470d3545a4e932ed4ea95b9d62,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 4818317370781631303, guid: 9d0963470d3545a4e932ed4ea95b9d62,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 5859956115695178477, guid: 9d0963470d3545a4e932ed4ea95b9d62,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -8111981235355854162, guid: 9d0963470d3545a4e932ed4ea95b9d62,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -5667621616349238808, guid: 9d0963470d3545a4e932ed4ea95b9d62,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Metal Corrugated 002_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002 - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002 - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002 - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002 - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002 - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002 - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002 - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002 - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Corrugated 002 - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -1355354389579744761, guid: 9d0963470d3545a4e932ed4ea95b9d62,
+      type: 3}
+    generatedTextures:
+    - {fileID: 4818317370781631303, guid: 9d0963470d3545a4e932ed4ea95b9d62, type: 3}
+    - {fileID: -3654691528969531916, guid: 9d0963470d3545a4e932ed4ea95b9d62, type: 3}
+    - {fileID: 5859956115695178477, guid: 9d0963470d3545a4e932ed4ea95b9d62, type: 3}
+    - {fileID: -8111981235355854162, guid: 9d0963470d3545a4e932ed4ea95b9d62, type: 3}
+    - {fileID: -5667621616349238808, guid: 9d0963470d3545a4e932ed4ea95b9d62, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_floor_002.sbsar b/Assets/Materials/Substance/Metal/metal_floor_002.sbsar
new file mode 100644
index 000000000..af4adc50c
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_floor_002.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5815e5257550f8315dd80831c4cab398a3ae7b234b25e716ecca18c9facbd9be
+size 11140
diff --git a/Assets/Materials/Substance/Metal/metal_floor_002.sbsar.meta b/Assets/Materials/Substance/Metal/metal_floor_002.sbsar.meta
new file mode 100644
index 000000000..c7ed06c18
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_floor_002.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: ddc6970cc883b9845bdadc91983130c2
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_floor_002/metal_floor_002
+  - first:
+      4: 400000
+    second: metal_floor_002/metal_floor_002/Transform
+  - first:
+      21: 2100000
+    second: mat.Metal Floor 002
+  - first:
+      23: 2300000
+    second: metal_floor_002/metal_floor_002/MeshRenderer
+  - first:
+      28: 2800000
+    second: Metal Floor 002_baseColor
+  - first:
+      28: 2800002
+    second: Metal Floor 002_normal
+  - first:
+      28: 2800004
+    second: Metal Floor 002_metallic
+  - first:
+      28: 2800006
+    second: Metal Floor 002_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Metal Floor 002_height
+  - first:
+      33: 3300000
+    second: metal_floor_002/metal_floor_002/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_floor_002/metal_floor_002/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_floor_002
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Metal Floor 002
+    prototypeName: Metal Floor 002
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_floor_002\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 351554284034007472, guid: ddc6970cc883b9845bdadc91983130c2,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -7508666898770042810, guid: ddc6970cc883b9845bdadc91983130c2,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -4403901252400104909, guid: ddc6970cc883b9845bdadc91983130c2,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -4356325417559842052, guid: ddc6970cc883b9845bdadc91983130c2,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -3247329771169464856, guid: ddc6970cc883b9845bdadc91983130c2,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Metal Floor 002_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002 - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002 - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002 - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002 - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002 - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002 - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002 - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002 - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 002 - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 3616699503892477274, guid: ddc6970cc883b9845bdadc91983130c2,
+      type: 3}
+    generatedTextures:
+    - {fileID: -7508666898770042810, guid: ddc6970cc883b9845bdadc91983130c2, type: 3}
+    - {fileID: 351554284034007472, guid: ddc6970cc883b9845bdadc91983130c2, type: 3}
+    - {fileID: -4403901252400104909, guid: ddc6970cc883b9845bdadc91983130c2, type: 3}
+    - {fileID: -4356325417559842052, guid: ddc6970cc883b9845bdadc91983130c2, type: 3}
+    - {fileID: -3247329771169464856, guid: ddc6970cc883b9845bdadc91983130c2, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_floor_004.sbsar b/Assets/Materials/Substance/Metal/metal_floor_004.sbsar
new file mode 100644
index 000000000..f7136c15b
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_floor_004.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d30688944fced2d854f8375ebecd8ad7a6a8021cee07e89710b44ad8272addd
+size 8634
diff --git a/Assets/Materials/Substance/Metal/metal_floor_004.sbsar.meta b/Assets/Materials/Substance/Metal/metal_floor_004.sbsar.meta
new file mode 100644
index 000000000..1729294eb
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_floor_004.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: 50192727b92e0af4cbe5c773bec3537f
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_floor_004/metal_floor_004
+  - first:
+      4: 400000
+    second: metal_floor_004/metal_floor_004/Transform
+  - first:
+      21: 2100000
+    second: mat.Metal Floor 004
+  - first:
+      23: 2300000
+    second: metal_floor_004/metal_floor_004/MeshRenderer
+  - first:
+      28: 2800000
+    second: Metal Floor 004_baseColor
+  - first:
+      28: 2800002
+    second: Metal Floor 004_normal
+  - first:
+      28: 2800004
+    second: Metal Floor 004_metallic
+  - first:
+      28: 2800006
+    second: Metal Floor 004_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Metal Floor 004_height
+  - first:
+      33: 3300000
+    second: metal_floor_004/metal_floor_004/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_floor_004/metal_floor_004/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_floor_004
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Metal Floor 004
+    prototypeName: Metal Floor 004
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_floor_004\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 5886398526092406922, guid: 50192727b92e0af4cbe5c773bec3537f,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 1550179426837470591, guid: 50192727b92e0af4cbe5c773bec3537f,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 4385304290797446058, guid: 50192727b92e0af4cbe5c773bec3537f,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -3130265262045919237, guid: 50192727b92e0af4cbe5c773bec3537f,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 4866469902769357514, guid: 50192727b92e0af4cbe5c773bec3537f,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Metal Floor 004_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004 - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004 - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004 - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004 - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004 - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004 - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004 - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004 - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 004 - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -1891697860355797410, guid: 50192727b92e0af4cbe5c773bec3537f,
+      type: 3}
+    generatedTextures:
+    - {fileID: 1550179426837470591, guid: 50192727b92e0af4cbe5c773bec3537f, type: 3}
+    - {fileID: 5886398526092406922, guid: 50192727b92e0af4cbe5c773bec3537f, type: 3}
+    - {fileID: 4385304290797446058, guid: 50192727b92e0af4cbe5c773bec3537f, type: 3}
+    - {fileID: -3130265262045919237, guid: 50192727b92e0af4cbe5c773bec3537f, type: 3}
+    - {fileID: 4866469902769357514, guid: 50192727b92e0af4cbe5c773bec3537f, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_floor_006.sbsar b/Assets/Materials/Substance/Metal/metal_floor_006.sbsar
new file mode 100644
index 000000000..81ce60800
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_floor_006.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9604a8c7814d09f90d8bc64061cdc39c733d9f96de43143717f9a951b1f08a0e
+size 10884
diff --git a/Assets/Materials/Substance/Metal/metal_floor_006.sbsar.meta b/Assets/Materials/Substance/Metal/metal_floor_006.sbsar.meta
new file mode 100644
index 000000000..19ae5cea1
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_floor_006.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: 06833951ebae4cc45ad88d58cb5571de
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_floor_006/metal_floor_006
+  - first:
+      4: 400000
+    second: metal_floor_006/metal_floor_006/Transform
+  - first:
+      21: 2100000
+    second: mat.Metal Floor 006
+  - first:
+      23: 2300000
+    second: metal_floor_006/metal_floor_006/MeshRenderer
+  - first:
+      28: 2800000
+    second: Metal Floor 006_baseColor
+  - first:
+      28: 2800002
+    second: Metal Floor 006_normal
+  - first:
+      28: 2800004
+    second: Metal Floor 006_metallic
+  - first:
+      28: 2800006
+    second: Metal Floor 006_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Metal Floor 006_height
+  - first:
+      33: 3300000
+    second: metal_floor_006/metal_floor_006/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_floor_006/metal_floor_006/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_floor_006
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Metal Floor 006
+    prototypeName: Metal Floor 006
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_floor_006\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -2252411089510067877, guid: 06833951ebae4cc45ad88d58cb5571de,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -446378320346000722, guid: 06833951ebae4cc45ad88d58cb5571de,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 877764506763962143, guid: 06833951ebae4cc45ad88d58cb5571de,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -4232129871321120126, guid: 06833951ebae4cc45ad88d58cb5571de,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 3318615130639472310, guid: 06833951ebae4cc45ad88d58cb5571de,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Metal Floor 006_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006 - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006 - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006 - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006 - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006 - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006 - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006 - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006 - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Floor 006 - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -6975397259061671394, guid: 06833951ebae4cc45ad88d58cb5571de,
+      type: 3}
+    generatedTextures:
+    - {fileID: -446378320346000722, guid: 06833951ebae4cc45ad88d58cb5571de, type: 3}
+    - {fileID: -2252411089510067877, guid: 06833951ebae4cc45ad88d58cb5571de, type: 3}
+    - {fileID: 877764506763962143, guid: 06833951ebae4cc45ad88d58cb5571de, type: 3}
+    - {fileID: -4232129871321120126, guid: 06833951ebae4cc45ad88d58cb5571de, type: 3}
+    - {fileID: 3318615130639472310, guid: 06833951ebae4cc45ad88d58cb5571de, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_gold.sbsar b/Assets/Materials/Substance/Metal/metal_gold.sbsar
new file mode 100644
index 000000000..5aa377680
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_gold.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29ef1a459ab7d090b32ee563d729038527c4d031595abef2a49398543d11343c
+size 7428
diff --git a/Assets/Materials/Substance/Metal/metal_gold.sbsar.meta b/Assets/Materials/Substance/Metal/metal_gold.sbsar.meta
new file mode 100644
index 000000000..53a0c20c3
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_gold.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: a74970be876d3554ea0f279f39314c9c
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_gold/metal_gold
+  - first:
+      4: 400000
+    second: metal_gold/metal_gold/Transform
+  - first:
+      21: 2100000
+    second: mat.Gold
+  - first:
+      23: 2300000
+    second: metal_gold/metal_gold/MeshRenderer
+  - first:
+      28: 2800000
+    second: Gold_baseColor
+  - first:
+      28: 2800002
+    second: Gold_normal
+  - first:
+      28: 2800004
+    second: Gold_metallic
+  - first:
+      28: 2800006
+    second: Gold_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Gold_height
+  - first:
+      33: 3300000
+    second: metal_gold/metal_gold/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_gold/metal_gold/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_gold
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Gold
+    prototypeName: Gold
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_gold\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -6248678595456566848, guid: a74970be876d3554ea0f279f39314c9c,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 2039085267362074300, guid: a74970be876d3554ea0f279f39314c9c,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -8783136193678078058, guid: a74970be876d3554ea0f279f39314c9c,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 7384525862955468029, guid: a74970be876d3554ea0f279f39314c9c,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -8934633548313413119, guid: a74970be876d3554ea0f279f39314c9c,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Gold_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Gold - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -905690159841262435, guid: a74970be876d3554ea0f279f39314c9c,
+      type: 3}
+    generatedTextures:
+    - {fileID: 2039085267362074300, guid: a74970be876d3554ea0f279f39314c9c, type: 3}
+    - {fileID: -6248678595456566848, guid: a74970be876d3554ea0f279f39314c9c, type: 3}
+    - {fileID: -8783136193678078058, guid: a74970be876d3554ea0f279f39314c9c, type: 3}
+    - {fileID: 7384525862955468029, guid: a74970be876d3554ea0f279f39314c9c, type: 3}
+    - {fileID: -8934633548313413119, guid: a74970be876d3554ea0f279f39314c9c, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_nickel.sbsar b/Assets/Materials/Substance/Metal/metal_nickel.sbsar
new file mode 100644
index 000000000..e7cf69c6b
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_nickel.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a0395691305bc49406088b12b65ea186d65d5101bc230a2e91b4ddbf2c7b65ea
+size 8935
diff --git a/Assets/Materials/Substance/Metal/metal_nickel.sbsar.meta b/Assets/Materials/Substance/Metal/metal_nickel.sbsar.meta
new file mode 100644
index 000000000..24f377bde
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_nickel.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: c5f2177e1f35daa499f4d7e0b7f3370a
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_nickel/metal_nickel
+  - first:
+      4: 400000
+    second: metal_nickel/metal_nickel/Transform
+  - first:
+      21: 2100000
+    second: mat.Nickel
+  - first:
+      23: 2300000
+    second: metal_nickel/metal_nickel/MeshRenderer
+  - first:
+      28: 2800000
+    second: Nickel_baseColor
+  - first:
+      28: 2800002
+    second: Nickel_normal
+  - first:
+      28: 2800004
+    second: Nickel_metallic
+  - first:
+      28: 2800006
+    second: Nickel_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Nickel_height
+  - first:
+      33: 3300000
+    second: metal_nickel/metal_nickel/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_nickel/metal_nickel/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_nickel
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Nickel
+    prototypeName: Nickel
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_nickel\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 1040180909335529060, guid: c5f2177e1f35daa499f4d7e0b7f3370a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -3896990606402278735, guid: c5f2177e1f35daa499f4d7e0b7f3370a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -8156577797594723071, guid: c5f2177e1f35daa499f4d7e0b7f3370a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -7935365347593253955, guid: c5f2177e1f35daa499f4d7e0b7f3370a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -4922792887777872198, guid: c5f2177e1f35daa499f4d7e0b7f3370a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Nickel_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Nickel - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -443055228576417237, guid: c5f2177e1f35daa499f4d7e0b7f3370a,
+      type: 3}
+    generatedTextures:
+    - {fileID: -3896990606402278735, guid: c5f2177e1f35daa499f4d7e0b7f3370a, type: 3}
+    - {fileID: 1040180909335529060, guid: c5f2177e1f35daa499f4d7e0b7f3370a, type: 3}
+    - {fileID: -8156577797594723071, guid: c5f2177e1f35daa499f4d7e0b7f3370a, type: 3}
+    - {fileID: -7935365347593253955, guid: c5f2177e1f35daa499f4d7e0b7f3370a, type: 3}
+    - {fileID: -4922792887777872198, guid: c5f2177e1f35daa499f4d7e0b7f3370a, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_painted_steel.sbsar b/Assets/Materials/Substance/Metal/metal_painted_steel.sbsar
new file mode 100644
index 000000000..d764cd35f
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_painted_steel.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc8dcd55f0619c028037c7225720acb4eea87b28cc7c120125fa2b38d02f775a
+size 13628
diff --git a/Assets/Materials/Substance/Metal/metal_painted_steel.sbsar.meta b/Assets/Materials/Substance/Metal/metal_painted_steel.sbsar.meta
new file mode 100644
index 000000000..b504894e6
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_painted_steel.sbsar.meta
@@ -0,0 +1,376 @@
+fileFormatVersion: 2
+guid: b7e648471e9dfc44490bd41973711541
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_painted_steel/metal_painted_steel
+  - first:
+      4: 400000
+    second: metal_painted_steel/metal_painted_steel/Transform
+  - first:
+      21: 2100000
+    second: mat.Painted steel
+  - first:
+      23: 2300000
+    second: metal_painted_steel/metal_painted_steel/MeshRenderer
+  - first:
+      28: 2800000
+    second: Painted steel_baseColor
+  - first:
+      28: 2800002
+    second: Painted steel_normal
+  - first:
+      28: 2800004
+    second: Painted steel_metallic
+  - first:
+      28: 2800006
+    second: Painted steel_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Painted steel_height
+  - first:
+      33: 3300000
+    second: metal_painted_steel/metal_painted_steel/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_painted_steel/metal_painted_steel/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_painted_steel
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Painted steel
+    prototypeName: Painted steel
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_painted_steel\" label=\"\" >\n  <presetinput
+      identifier=\"$outputsize\" uid=\"326965559\" type=\"8\" value=\"10,10\" />\n 
+      <presetinput identifier=\"$randomseed\" uid=\"1141837669\" type=\"4\" value=\"6025\"
+      />\n  <presetinput identifier=\"scratches\" uid=\"1855038369\" type=\"0\" value=\"1\"
+      />\n  <presetinput identifier=\"rust\" uid=\"1776436197\" type=\"0\" value=\"0.29\"
+      />\n  <presetinput identifier=\"paint_color\" uid=\"1770592093\" type=\"2\"
+      value=\"1,0.583333,0\" />\n  <presetinput identifier=\"paint_roughness\" uid=\"1855031964\"
+      type=\"0\" value=\"0.18\" />\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -812895718602229137, guid: b7e648471e9dfc44490bd41973711541,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 4387638379454744182, guid: b7e648471e9dfc44490bd41973711541,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 5280895355680202213, guid: b7e648471e9dfc44490bd41973711541,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 1053975553097811288, guid: b7e648471e9dfc44490bd41973711541,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -5932748352949090903, guid: b7e648471e9dfc44490bd41973711541,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Painted steel_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Painted steel - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 1024
+      textureHeight: 1024
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -4658142721435264040, guid: b7e648471e9dfc44490bd41973711541,
+      type: 3}
+    generatedTextures:
+    - {fileID: 4387638379454744182, guid: b7e648471e9dfc44490bd41973711541, type: 3}
+    - {fileID: -812895718602229137, guid: b7e648471e9dfc44490bd41973711541, type: 3}
+    - {fileID: 5280895355680202213, guid: b7e648471e9dfc44490bd41973711541, type: 3}
+    - {fileID: 1053975553097811288, guid: b7e648471e9dfc44490bd41973711541, type: 3}
+    - {fileID: -5932748352949090903, guid: b7e648471e9dfc44490bd41973711541, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_panels_001.sbsar b/Assets/Materials/Substance/Metal/metal_panels_001.sbsar
new file mode 100644
index 000000000..2ee3b87ea
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_panels_001.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e868f72fde8e3c55a2d8c097ebb39c05157670897d14eeb86932021feec16158
+size 11295
diff --git a/Assets/Materials/Substance/Metal/metal_panels_001.sbsar.meta b/Assets/Materials/Substance/Metal/metal_panels_001.sbsar.meta
new file mode 100644
index 000000000..eebed5324
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_panels_001.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: 7363fcc4a3c41a349b29de7ec34555be
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_panels_001/metal_panels_001
+  - first:
+      4: 400000
+    second: metal_panels_001/metal_panels_001/Transform
+  - first:
+      21: 2100000
+    second: mat.Metal Panels 001
+  - first:
+      23: 2300000
+    second: metal_panels_001/metal_panels_001/MeshRenderer
+  - first:
+      28: 2800000
+    second: Metal Panels 001_baseColor
+  - first:
+      28: 2800002
+    second: Metal Panels 001_normal
+  - first:
+      28: 2800004
+    second: Metal Panels 001_metallic
+  - first:
+      28: 2800006
+    second: Metal Panels 001_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Metal Panels 001_height
+  - first:
+      33: 3300000
+    second: metal_panels_001/metal_panels_001/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_panels_001/metal_panels_001/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_panels_001
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Metal Panels 001
+    prototypeName: Metal Panels 001
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_panels_001\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 2945532018097518028, guid: 7363fcc4a3c41a349b29de7ec34555be,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 6344665451385196243, guid: 7363fcc4a3c41a349b29de7ec34555be,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -103584793617860315, guid: 7363fcc4a3c41a349b29de7ec34555be,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -2941359408041138506, guid: 7363fcc4a3c41a349b29de7ec34555be,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 1361220934952870948, guid: 7363fcc4a3c41a349b29de7ec34555be,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Metal Panels 001_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001 - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001 - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001 - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001 - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001 - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001 - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001 - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001 - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 001 - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 1523472303362493764, guid: 7363fcc4a3c41a349b29de7ec34555be,
+      type: 3}
+    generatedTextures:
+    - {fileID: 6344665451385196243, guid: 7363fcc4a3c41a349b29de7ec34555be, type: 3}
+    - {fileID: 2945532018097518028, guid: 7363fcc4a3c41a349b29de7ec34555be, type: 3}
+    - {fileID: -103584793617860315, guid: 7363fcc4a3c41a349b29de7ec34555be, type: 3}
+    - {fileID: -2941359408041138506, guid: 7363fcc4a3c41a349b29de7ec34555be, type: 3}
+    - {fileID: 1361220934952870948, guid: 7363fcc4a3c41a349b29de7ec34555be, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_panels_002.sbsar b/Assets/Materials/Substance/Metal/metal_panels_002.sbsar
new file mode 100644
index 000000000..2cf3cd0b5
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_panels_002.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b16e09a1b06ae6b857d9f9478af0838a31ba554a2455b9e65e9db43a125ce633
+size 7592
diff --git a/Assets/Materials/Substance/Metal/metal_panels_002.sbsar.meta b/Assets/Materials/Substance/Metal/metal_panels_002.sbsar.meta
new file mode 100644
index 000000000..74215bc06
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_panels_002.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: 2e9a9dbacde66a446852af882f33e9e2
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_panels_002/metal_panels_002
+  - first:
+      4: 400000
+    second: metal_panels_002/metal_panels_002/Transform
+  - first:
+      21: 2100000
+    second: mat.Metal Panels 002
+  - first:
+      23: 2300000
+    second: metal_panels_002/metal_panels_002/MeshRenderer
+  - first:
+      28: 2800000
+    second: Metal Panels 002_baseColor
+  - first:
+      28: 2800002
+    second: Metal Panels 002_normal
+  - first:
+      28: 2800004
+    second: Metal Panels 002_metallic
+  - first:
+      28: 2800006
+    second: Metal Panels 002_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Metal Panels 002_height
+  - first:
+      33: 3300000
+    second: metal_panels_002/metal_panels_002/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_panels_002/metal_panels_002/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_panels_002
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Metal Panels 002
+    prototypeName: Metal Panels 002
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_panels_002\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -7157783387845257801, guid: 2e9a9dbacde66a446852af882f33e9e2,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 6030008930922367719, guid: 2e9a9dbacde66a446852af882f33e9e2,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -5177487458041023939, guid: 2e9a9dbacde66a446852af882f33e9e2,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -6221273311826804186, guid: 2e9a9dbacde66a446852af882f33e9e2,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -2755774738339798629, guid: 2e9a9dbacde66a446852af882f33e9e2,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Metal Panels 002_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002 - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002 - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002 - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002 - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002 - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002 - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002 - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002 - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Panels 002 - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 3282252981698000714, guid: 2e9a9dbacde66a446852af882f33e9e2,
+      type: 3}
+    generatedTextures:
+    - {fileID: 6030008930922367719, guid: 2e9a9dbacde66a446852af882f33e9e2, type: 3}
+    - {fileID: -7157783387845257801, guid: 2e9a9dbacde66a446852af882f33e9e2, type: 3}
+    - {fileID: -5177487458041023939, guid: 2e9a9dbacde66a446852af882f33e9e2, type: 3}
+    - {fileID: -6221273311826804186, guid: 2e9a9dbacde66a446852af882f33e9e2, type: 3}
+    - {fileID: -2755774738339798629, guid: 2e9a9dbacde66a446852af882f33e9e2, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_plate_001.sbsar b/Assets/Materials/Substance/Metal/metal_plate_001.sbsar
new file mode 100644
index 000000000..3d06effb9
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_plate_001.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c9aea022bbc0138be51bb7b89314a569ad359390a0b8d1b6b2c717d317acd8b
+size 10171
diff --git a/Assets/Materials/Substance/Metal/metal_plate_001.sbsar.meta b/Assets/Materials/Substance/Metal/metal_plate_001.sbsar.meta
new file mode 100644
index 000000000..864a0aeb5
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_plate_001.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: 180b85899b4b1f848b348230339ce984
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_plate_001/metal_plate_001
+  - first:
+      4: 400000
+    second: metal_plate_001/metal_plate_001/Transform
+  - first:
+      21: 2100000
+    second: mat.Metal plate 001
+  - first:
+      23: 2300000
+    second: metal_plate_001/metal_plate_001/MeshRenderer
+  - first:
+      28: 2800000
+    second: Metal plate 001_baseColor
+  - first:
+      28: 2800002
+    second: Metal plate 001_normal
+  - first:
+      28: 2800004
+    second: Metal plate 001_metallic
+  - first:
+      28: 2800006
+    second: Metal plate 001_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Metal plate 001_height
+  - first:
+      33: 3300000
+    second: metal_plate_001/metal_plate_001/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_plate_001/metal_plate_001/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_plate_001
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Metal plate 001
+    prototypeName: Metal plate 001
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_plate_001\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 6805374924820727666, guid: 180b85899b4b1f848b348230339ce984,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 443512894100413061, guid: 180b85899b4b1f848b348230339ce984,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -3656363544911682969, guid: 180b85899b4b1f848b348230339ce984,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 6012193567810889268, guid: 180b85899b4b1f848b348230339ce984,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 1247009903862830065, guid: 180b85899b4b1f848b348230339ce984,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Metal plate 001_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001 - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001 - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001 - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001 - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001 - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001 - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001 - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001 - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 001 - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -1468868417959000437, guid: 180b85899b4b1f848b348230339ce984,
+      type: 3}
+    generatedTextures:
+    - {fileID: 443512894100413061, guid: 180b85899b4b1f848b348230339ce984, type: 3}
+    - {fileID: 6805374924820727666, guid: 180b85899b4b1f848b348230339ce984, type: 3}
+    - {fileID: -3656363544911682969, guid: 180b85899b4b1f848b348230339ce984, type: 3}
+    - {fileID: 6012193567810889268, guid: 180b85899b4b1f848b348230339ce984, type: 3}
+    - {fileID: 1247009903862830065, guid: 180b85899b4b1f848b348230339ce984, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_plate_004.sbsar b/Assets/Materials/Substance/Metal/metal_plate_004.sbsar
new file mode 100644
index 000000000..dc0474e13
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_plate_004.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:65295627150c30fc70fe138aee16c2266bffdd0a5b1fbcbe7fe040a3d0309d39
+size 14216
diff --git a/Assets/Materials/Substance/Metal/metal_plate_004.sbsar.meta b/Assets/Materials/Substance/Metal/metal_plate_004.sbsar.meta
new file mode 100644
index 000000000..39bc5f8a9
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_plate_004.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: 0b5dfc86c0681a3459a57d197804191b
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_plate_004/metal_plate_004
+  - first:
+      4: 400000
+    second: metal_plate_004/metal_plate_004/Transform
+  - first:
+      21: 2100000
+    second: mat.Metal plate 004
+  - first:
+      23: 2300000
+    second: metal_plate_004/metal_plate_004/MeshRenderer
+  - first:
+      28: 2800000
+    second: Metal plate 004_baseColor
+  - first:
+      28: 2800002
+    second: Metal plate 004_normal
+  - first:
+      28: 2800004
+    second: Metal plate 004_metallic
+  - first:
+      28: 2800006
+    second: Metal plate 004_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Metal plate 004_height
+  - first:
+      33: 3300000
+    second: metal_plate_004/metal_plate_004/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_plate_004/metal_plate_004/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_plate_004
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Metal plate 004
+    prototypeName: Metal plate 004
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_plate_004\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -7484568915117973449, guid: 0b5dfc86c0681a3459a57d197804191b,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 1309396409266656355, guid: 0b5dfc86c0681a3459a57d197804191b,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -5781884682247363129, guid: 0b5dfc86c0681a3459a57d197804191b,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 5620992320681838871, guid: 0b5dfc86c0681a3459a57d197804191b,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 6570316561944570698, guid: 0b5dfc86c0681a3459a57d197804191b,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Metal plate 004_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004 - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004 - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004 - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004 - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004 - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004 - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004 - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004 - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 004 - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -5894754650268316995, guid: 0b5dfc86c0681a3459a57d197804191b,
+      type: 3}
+    generatedTextures:
+    - {fileID: 1309396409266656355, guid: 0b5dfc86c0681a3459a57d197804191b, type: 3}
+    - {fileID: -7484568915117973449, guid: 0b5dfc86c0681a3459a57d197804191b, type: 3}
+    - {fileID: -5781884682247363129, guid: 0b5dfc86c0681a3459a57d197804191b, type: 3}
+    - {fileID: 5620992320681838871, guid: 0b5dfc86c0681a3459a57d197804191b, type: 3}
+    - {fileID: 6570316561944570698, guid: 0b5dfc86c0681a3459a57d197804191b, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_plate_011.sbsar b/Assets/Materials/Substance/Metal/metal_plate_011.sbsar
new file mode 100644
index 000000000..c1e0a3922
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_plate_011.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:829bc422cbe5b984103972cd7cf36d207fe0a6b561a2619301dec3e684009784
+size 9674
diff --git a/Assets/Materials/Substance/Metal/metal_plate_011.sbsar.meta b/Assets/Materials/Substance/Metal/metal_plate_011.sbsar.meta
new file mode 100644
index 000000000..0953ebd37
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_plate_011.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: ca8f080ab60226e4097841eee2bfa8db
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_plate_011/metal_plate_011
+  - first:
+      4: 400000
+    second: metal_plate_011/metal_plate_011/Transform
+  - first:
+      21: 2100000
+    second: mat.Metal plate 011
+  - first:
+      23: 2300000
+    second: metal_plate_011/metal_plate_011/MeshRenderer
+  - first:
+      28: 2800000
+    second: Metal plate 011_baseColor
+  - first:
+      28: 2800002
+    second: Metal plate 011_normal
+  - first:
+      28: 2800004
+    second: Metal plate 011_metallic
+  - first:
+      28: 2800006
+    second: Metal plate 011_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Metal plate 011_height
+  - first:
+      33: 3300000
+    second: metal_plate_011/metal_plate_011/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_plate_011/metal_plate_011/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_plate_011
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Metal plate 011
+    prototypeName: Metal plate 011
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_plate_011\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 1206901763152500494, guid: ca8f080ab60226e4097841eee2bfa8db,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -562402163750398719, guid: ca8f080ab60226e4097841eee2bfa8db,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -8211546087015286653, guid: ca8f080ab60226e4097841eee2bfa8db,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 7355910353852850503, guid: ca8f080ab60226e4097841eee2bfa8db,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -2794334530799708578, guid: ca8f080ab60226e4097841eee2bfa8db,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Metal plate 011_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011 - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011 - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011 - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011 - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011 - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011 - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011 - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011 - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal plate 011 - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 5028268363422298589, guid: ca8f080ab60226e4097841eee2bfa8db,
+      type: 3}
+    generatedTextures:
+    - {fileID: -562402163750398719, guid: ca8f080ab60226e4097841eee2bfa8db, type: 3}
+    - {fileID: 1206901763152500494, guid: ca8f080ab60226e4097841eee2bfa8db, type: 3}
+    - {fileID: -8211546087015286653, guid: ca8f080ab60226e4097841eee2bfa8db, type: 3}
+    - {fileID: 7355910353852850503, guid: ca8f080ab60226e4097841eee2bfa8db, type: 3}
+    - {fileID: -2794334530799708578, guid: ca8f080ab60226e4097841eee2bfa8db, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_platinum.sbsar b/Assets/Materials/Substance/Metal/metal_platinum.sbsar
new file mode 100644
index 000000000..ffaec19de
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_platinum.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b880030baaf5ccc272c780265fc4b1570a55a63a8b804223ccbdc54a576b9be7
+size 5196
diff --git a/Assets/Materials/Substance/Metal/metal_platinum.sbsar.meta b/Assets/Materials/Substance/Metal/metal_platinum.sbsar.meta
new file mode 100644
index 000000000..cb80479df
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_platinum.sbsar.meta
@@ -0,0 +1,372 @@
+fileFormatVersion: 2
+guid: 9458f33b8e7e51a42aa19686b9779d82
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_platinum/metal_platinum
+  - first:
+      4: 400000
+    second: metal_platinum/metal_platinum/Transform
+  - first:
+      21: 2100000
+    second: mat.Platinum
+  - first:
+      23: 2300000
+    second: metal_platinum/metal_platinum/MeshRenderer
+  - first:
+      28: 2800000
+    second: Platinum_baseColor
+  - first:
+      28: 2800002
+    second: Platinum_normal
+  - first:
+      28: 2800004
+    second: Platinum_metallic
+  - first:
+      28: 2800006
+    second: Platinum_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Platinum_height
+  - first:
+      33: 3300000
+    second: metal_platinum/metal_platinum/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_platinum/metal_platinum/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_platinum
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Platinum
+    prototypeName: Platinum
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_platinum\" label=\"\" >\n  <presetinput
+      identifier=\"dirt\" uid=\"3294776141\" type=\"0\" value=\"0.43\" />\n  <presetinput
+      identifier=\"surface_imperfections\" uid=\"3166060376\" type=\"0\" value=\"1\"
+      />\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 3498638986299907941, guid: 9458f33b8e7e51a42aa19686b9779d82,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -8172963137857357993, guid: 9458f33b8e7e51a42aa19686b9779d82,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -8040379993892829019, guid: 9458f33b8e7e51a42aa19686b9779d82,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 225164955126363719, guid: 9458f33b8e7e51a42aa19686b9779d82,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -130007606447889175, guid: 9458f33b8e7e51a42aa19686b9779d82,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Platinum_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Platinum - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 8636029498071112704, guid: 9458f33b8e7e51a42aa19686b9779d82,
+      type: 3}
+    generatedTextures:
+    - {fileID: -8172963137857357993, guid: 9458f33b8e7e51a42aa19686b9779d82, type: 3}
+    - {fileID: 3498638986299907941, guid: 9458f33b8e7e51a42aa19686b9779d82, type: 3}
+    - {fileID: -8040379993892829019, guid: 9458f33b8e7e51a42aa19686b9779d82, type: 3}
+    - {fileID: 225164955126363719, guid: 9458f33b8e7e51a42aa19686b9779d82, type: 3}
+    - {fileID: -130007606447889175, guid: 9458f33b8e7e51a42aa19686b9779d82, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_roll_up.sbsar b/Assets/Materials/Substance/Metal/metal_roll_up.sbsar
new file mode 100644
index 000000000..db99f183e
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_roll_up.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1a2036e21cdd2d392fdcb755d2faf982335fc4deaa8c7b913110db234fa04f3a
+size 11017
diff --git a/Assets/Materials/Substance/Metal/metal_roll_up.sbsar.meta b/Assets/Materials/Substance/Metal/metal_roll_up.sbsar.meta
new file mode 100644
index 000000000..ae0e93c6d
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_roll_up.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: 4e39297ae4fe9ee4b803c04eabb69da7
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_roll_up/metal_roll_up
+  - first:
+      4: 400000
+    second: metal_roll_up/metal_roll_up/Transform
+  - first:
+      21: 2100000
+    second: mat.Metal roll up
+  - first:
+      23: 2300000
+    second: metal_roll_up/metal_roll_up/MeshRenderer
+  - first:
+      28: 2800000
+    second: Metal roll up_baseColor
+  - first:
+      28: 2800002
+    second: Metal roll up_normal
+  - first:
+      28: 2800004
+    second: Metal roll up_metallic
+  - first:
+      28: 2800006
+    second: Metal roll up_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Metal roll up_height
+  - first:
+      33: 3300000
+    second: metal_roll_up/metal_roll_up/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_roll_up/metal_roll_up/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_roll_up
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Metal roll up
+    prototypeName: Metal roll up
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_roll_up\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 1258325809611119299, guid: 4e39297ae4fe9ee4b803c04eabb69da7,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -5250987364813910665, guid: 4e39297ae4fe9ee4b803c04eabb69da7,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -1897870436205287166, guid: 4e39297ae4fe9ee4b803c04eabb69da7,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 7199963334284863655, guid: 4e39297ae4fe9ee4b803c04eabb69da7,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 1153539711168243343, guid: 4e39297ae4fe9ee4b803c04eabb69da7,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Metal roll up_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal roll up - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 7440086527666654772, guid: 4e39297ae4fe9ee4b803c04eabb69da7,
+      type: 3}
+    generatedTextures:
+    - {fileID: -5250987364813910665, guid: 4e39297ae4fe9ee4b803c04eabb69da7, type: 3}
+    - {fileID: 1258325809611119299, guid: 4e39297ae4fe9ee4b803c04eabb69da7, type: 3}
+    - {fileID: -1897870436205287166, guid: 4e39297ae4fe9ee4b803c04eabb69da7, type: 3}
+    - {fileID: 7199963334284863655, guid: 4e39297ae4fe9ee4b803c04eabb69da7, type: 3}
+    - {fileID: 1153539711168243343, guid: 4e39297ae4fe9ee4b803c04eabb69da7, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_silver.sbsar b/Assets/Materials/Substance/Metal/metal_silver.sbsar
new file mode 100644
index 000000000..08b0ac146
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_silver.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b18ce39a69d5e25641d53fcbe04f281c92ca7e01936e6a9b279476be8ff3255
+size 6898
diff --git a/Assets/Materials/Substance/Metal/metal_silver.sbsar.meta b/Assets/Materials/Substance/Metal/metal_silver.sbsar.meta
new file mode 100644
index 000000000..5dfe7113a
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_silver.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: 0be5fb1df83ac8e499a3f6a060041e49
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_silver/metal_silver
+  - first:
+      4: 400000
+    second: metal_silver/metal_silver/Transform
+  - first:
+      21: 2100000
+    second: mat.Silver
+  - first:
+      23: 2300000
+    second: metal_silver/metal_silver/MeshRenderer
+  - first:
+      28: 2800000
+    second: Silver_baseColor
+  - first:
+      28: 2800002
+    second: Silver_normal
+  - first:
+      28: 2800004
+    second: Silver_metallic
+  - first:
+      28: 2800006
+    second: Silver_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Silver_height
+  - first:
+      33: 3300000
+    second: metal_silver/metal_silver/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_silver/metal_silver/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_silver
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Silver
+    prototypeName: Silver
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_silver\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 8947980237086559854, guid: 0be5fb1df83ac8e499a3f6a060041e49,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -1383037052668628532, guid: 0be5fb1df83ac8e499a3f6a060041e49,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 6429125567479694453, guid: 0be5fb1df83ac8e499a3f6a060041e49,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -9097439929179392311, guid: 0be5fb1df83ac8e499a3f6a060041e49,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 425190381137097012, guid: 0be5fb1df83ac8e499a3f6a060041e49,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Silver_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Silver - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 7490952440742008943, guid: 0be5fb1df83ac8e499a3f6a060041e49,
+      type: 3}
+    generatedTextures:
+    - {fileID: -1383037052668628532, guid: 0be5fb1df83ac8e499a3f6a060041e49, type: 3}
+    - {fileID: 8947980237086559854, guid: 0be5fb1df83ac8e499a3f6a060041e49, type: 3}
+    - {fileID: 6429125567479694453, guid: 0be5fb1df83ac8e499a3f6a060041e49, type: 3}
+    - {fileID: -9097439929179392311, guid: 0be5fb1df83ac8e499a3f6a060041e49, type: 3}
+    - {fileID: 425190381137097012, guid: 0be5fb1df83ac8e499a3f6a060041e49, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_steel.sbsar b/Assets/Materials/Substance/Metal/metal_steel.sbsar
new file mode 100644
index 000000000..31ec34fd3
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_steel.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d559edac51ad4c529c197d7c9a813fe8c2fa1bcb0963cd0f8bad8ab1403b3821
+size 10697
diff --git a/Assets/Materials/Substance/Metal/metal_steel.sbsar.meta b/Assets/Materials/Substance/Metal/metal_steel.sbsar.meta
new file mode 100644
index 000000000..e15845220
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_steel.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: cbc61995a46604441ab9de4f1c68e290
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_steel/metal_steel
+  - first:
+      4: 400000
+    second: metal_steel/metal_steel/Transform
+  - first:
+      21: 2100000
+    second: mat.Steel
+  - first:
+      23: 2300000
+    second: metal_steel/metal_steel/MeshRenderer
+  - first:
+      28: 2800000
+    second: Steel_baseColor
+  - first:
+      28: 2800002
+    second: Steel_normal
+  - first:
+      28: 2800004
+    second: Steel_metallic
+  - first:
+      28: 2800006
+    second: Steel_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Steel_height
+  - first:
+      33: 3300000
+    second: metal_steel/metal_steel/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_steel/metal_steel/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_steel
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Steel
+    prototypeName: Steel
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_steel\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -3888315358723833787, guid: cbc61995a46604441ab9de4f1c68e290,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 108215966750249586, guid: cbc61995a46604441ab9de4f1c68e290,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 4793252353645218242, guid: cbc61995a46604441ab9de4f1c68e290,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -4384182597330533215, guid: cbc61995a46604441ab9de4f1c68e290,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 4600200897981803784, guid: cbc61995a46604441ab9de4f1c68e290,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Steel_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -3155047780354543793, guid: cbc61995a46604441ab9de4f1c68e290,
+      type: 3}
+    generatedTextures:
+    - {fileID: 108215966750249586, guid: cbc61995a46604441ab9de4f1c68e290, type: 3}
+    - {fileID: -3888315358723833787, guid: cbc61995a46604441ab9de4f1c68e290, type: 3}
+    - {fileID: 4793252353645218242, guid: cbc61995a46604441ab9de4f1c68e290, type: 3}
+    - {fileID: -4384182597330533215, guid: cbc61995a46604441ab9de4f1c68e290, type: 3}
+    - {fileID: 4600200897981803784, guid: cbc61995a46604441ab9de4f1c68e290, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_steel_brushed.sbsar b/Assets/Materials/Substance/Metal/metal_steel_brushed.sbsar
new file mode 100644
index 000000000..45c0b10b3
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_steel_brushed.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf6b40453b42e050b2ce05478f1c1964d9489cdf02413f12b40f4ce1e49b4432
+size 12832
diff --git a/Assets/Materials/Substance/Metal/metal_steel_brushed.sbsar.meta b/Assets/Materials/Substance/Metal/metal_steel_brushed.sbsar.meta
new file mode 100644
index 000000000..04dc22a12
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_steel_brushed.sbsar.meta
@@ -0,0 +1,370 @@
+fileFormatVersion: 2
+guid: ea7457b9a4f0bcb43becaa33de541cbd
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_steel_brushed/metal_steel_brushed
+  - first:
+      4: 400000
+    second: metal_steel_brushed/metal_steel_brushed/Transform
+  - first:
+      21: 2100000
+    second: mat.Steel brushed
+  - first:
+      23: 2300000
+    second: metal_steel_brushed/metal_steel_brushed/MeshRenderer
+  - first:
+      28: 2800000
+    second: Steel brushed_baseColor
+  - first:
+      28: 2800002
+    second: Steel brushed_normal
+  - first:
+      28: 2800004
+    second: Steel brushed_metallic
+  - first:
+      28: 2800006
+    second: Steel brushed_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Steel brushed_height
+  - first:
+      33: 3300000
+    second: metal_steel_brushed/metal_steel_brushed/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_steel_brushed/metal_steel_brushed/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_steel_brushed
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Steel brushed
+    prototypeName: Steel brushed
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_steel_brushed\" label=\"\" >\n  <presetinput
+      identifier=\"oxidation\" uid=\"44192965\" type=\"0\" value=\"0.8\" />\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -4471413742775304797, guid: ea7457b9a4f0bcb43becaa33de541cbd,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -4638397344074346932, guid: ea7457b9a4f0bcb43becaa33de541cbd,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 5049811794194361025, guid: ea7457b9a4f0bcb43becaa33de541cbd,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 1753668427856518731, guid: ea7457b9a4f0bcb43becaa33de541cbd,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -3498708498072814504, guid: ea7457b9a4f0bcb43becaa33de541cbd,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Steel brushed_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel brushed - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 7852708265981260911, guid: ea7457b9a4f0bcb43becaa33de541cbd,
+      type: 3}
+    generatedTextures:
+    - {fileID: -4638397344074346932, guid: ea7457b9a4f0bcb43becaa33de541cbd, type: 3}
+    - {fileID: -4471413742775304797, guid: ea7457b9a4f0bcb43becaa33de541cbd, type: 3}
+    - {fileID: 5049811794194361025, guid: ea7457b9a4f0bcb43becaa33de541cbd, type: 3}
+    - {fileID: 1753668427856518731, guid: ea7457b9a4f0bcb43becaa33de541cbd, type: 3}
+    - {fileID: -3498708498072814504, guid: ea7457b9a4f0bcb43becaa33de541cbd, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_steel_bumped.sbsar b/Assets/Materials/Substance/Metal/metal_steel_bumped.sbsar
new file mode 100644
index 000000000..6580295bb
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_steel_bumped.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9ae449451a55abd8466e8af67685a45d86fd39ea2070294dde7f2a07776bea5
+size 17275
diff --git a/Assets/Materials/Substance/Metal/metal_steel_bumped.sbsar.meta b/Assets/Materials/Substance/Metal/metal_steel_bumped.sbsar.meta
new file mode 100644
index 000000000..9273139f0
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_steel_bumped.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: 092bdd8d243488141aeab5bb0d72429a
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_steel_bumped/metal_steel_bumped
+  - first:
+      4: 400000
+    second: metal_steel_bumped/metal_steel_bumped/Transform
+  - first:
+      21: 2100000
+    second: mat.Steel bumped
+  - first:
+      23: 2300000
+    second: metal_steel_bumped/metal_steel_bumped/MeshRenderer
+  - first:
+      28: 2800000
+    second: Steel bumped_baseColor
+  - first:
+      28: 2800002
+    second: Steel bumped_normal
+  - first:
+      28: 2800004
+    second: Steel bumped_metallic
+  - first:
+      28: 2800006
+    second: Steel bumped_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Steel bumped_height
+  - first:
+      33: 3300000
+    second: metal_steel_bumped/metal_steel_bumped/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_steel_bumped/metal_steel_bumped/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_steel_bumped
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Steel bumped
+    prototypeName: Steel bumped
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_steel_bumped\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 3586080781697202320, guid: 092bdd8d243488141aeab5bb0d72429a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 86365302875955127, guid: 092bdd8d243488141aeab5bb0d72429a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 9208498935135840223, guid: 092bdd8d243488141aeab5bb0d72429a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 7740971908710523460, guid: 092bdd8d243488141aeab5bb0d72429a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 6493472383464308858, guid: 092bdd8d243488141aeab5bb0d72429a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Steel bumped_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel bumped - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -864409875390858066, guid: 092bdd8d243488141aeab5bb0d72429a,
+      type: 3}
+    generatedTextures:
+    - {fileID: 86365302875955127, guid: 092bdd8d243488141aeab5bb0d72429a, type: 3}
+    - {fileID: 3586080781697202320, guid: 092bdd8d243488141aeab5bb0d72429a, type: 3}
+    - {fileID: 9208498935135840223, guid: 092bdd8d243488141aeab5bb0d72429a, type: 3}
+    - {fileID: 7740971908710523460, guid: 092bdd8d243488141aeab5bb0d72429a, type: 3}
+    - {fileID: 6493472383464308858, guid: 092bdd8d243488141aeab5bb0d72429a, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_steel_parkerized.sbsar b/Assets/Materials/Substance/Metal/metal_steel_parkerized.sbsar
new file mode 100644
index 000000000..92bee293c
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_steel_parkerized.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54993a1aae47acf7e1aba24812f215e1787969016dd1f420899ab363342a7b6d
+size 9206
diff --git a/Assets/Materials/Substance/Metal/metal_steel_parkerized.sbsar.meta b/Assets/Materials/Substance/Metal/metal_steel_parkerized.sbsar.meta
new file mode 100644
index 000000000..e55178947
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_steel_parkerized.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: e7758cad28ae98f478940e55222419a6
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_steel_parkerized/metal_steel_parkerized
+  - first:
+      4: 400000
+    second: metal_steel_parkerized/metal_steel_parkerized/Transform
+  - first:
+      21: 2100000
+    second: mat.Steel parkerized
+  - first:
+      23: 2300000
+    second: metal_steel_parkerized/metal_steel_parkerized/MeshRenderer
+  - first:
+      28: 2800000
+    second: Steel parkerized_baseColor
+  - first:
+      28: 2800002
+    second: Steel parkerized_normal
+  - first:
+      28: 2800004
+    second: Steel parkerized_metallic
+  - first:
+      28: 2800006
+    second: Steel parkerized_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Steel parkerized_height
+  - first:
+      33: 3300000
+    second: metal_steel_parkerized/metal_steel_parkerized/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_steel_parkerized/metal_steel_parkerized/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_steel_parkerized
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Steel parkerized
+    prototypeName: Steel parkerized
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_steel_parkerized\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 885599758852769373, guid: e7758cad28ae98f478940e55222419a6,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -4474525002722929857, guid: e7758cad28ae98f478940e55222419a6,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -2334804936223627746, guid: e7758cad28ae98f478940e55222419a6,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -8380876848358870972, guid: e7758cad28ae98f478940e55222419a6,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 172713863077875830, guid: e7758cad28ae98f478940e55222419a6,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Steel parkerized_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel parkerized - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -6026401407715332296, guid: e7758cad28ae98f478940e55222419a6,
+      type: 3}
+    generatedTextures:
+    - {fileID: -4474525002722929857, guid: e7758cad28ae98f478940e55222419a6, type: 3}
+    - {fileID: 885599758852769373, guid: e7758cad28ae98f478940e55222419a6, type: 3}
+    - {fileID: -2334804936223627746, guid: e7758cad28ae98f478940e55222419a6, type: 3}
+    - {fileID: -8380876848358870972, guid: e7758cad28ae98f478940e55222419a6, type: 3}
+    - {fileID: 172713863077875830, guid: e7758cad28ae98f478940e55222419a6, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_titanium.sbsar b/Assets/Materials/Substance/Metal/metal_titanium.sbsar
new file mode 100644
index 000000000..ede9cde4d
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_titanium.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e3aabfbcb813fef9ef20793d54c93bf5c37255573bb8ad043620f60041acd6d1
+size 5206
diff --git a/Assets/Materials/Substance/Metal/metal_titanium.sbsar.meta b/Assets/Materials/Substance/Metal/metal_titanium.sbsar.meta
new file mode 100644
index 000000000..521d05bba
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_titanium.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: 58e16b7dbc1c31f4585e11544cdce127
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_titanium/metal_titanium
+  - first:
+      4: 400000
+    second: metal_titanium/metal_titanium/Transform
+  - first:
+      21: 2100000
+    second: mat.Titanium
+  - first:
+      23: 2300000
+    second: metal_titanium/metal_titanium/MeshRenderer
+  - first:
+      28: 2800000
+    second: Titanium_baseColor
+  - first:
+      28: 2800002
+    second: Titanium_normal
+  - first:
+      28: 2800004
+    second: Titanium_metallic
+  - first:
+      28: 2800006
+    second: Titanium_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Titanium_height
+  - first:
+      33: 3300000
+    second: metal_titanium/metal_titanium/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_titanium/metal_titanium/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_titanium
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Titanium
+    prototypeName: Titanium
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_titanium\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -5074057273227030627, guid: 58e16b7dbc1c31f4585e11544cdce127,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 3009319823116150993, guid: 58e16b7dbc1c31f4585e11544cdce127,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 3613456606582262254, guid: 58e16b7dbc1c31f4585e11544cdce127,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 7558371940554398246, guid: 58e16b7dbc1c31f4585e11544cdce127,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -3774795931012705877, guid: 58e16b7dbc1c31f4585e11544cdce127,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Titanium_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Titanium - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 9178725544925813344, guid: 58e16b7dbc1c31f4585e11544cdce127,
+      type: 3}
+    generatedTextures:
+    - {fileID: 3009319823116150993, guid: 58e16b7dbc1c31f4585e11544cdce127, type: 3}
+    - {fileID: -5074057273227030627, guid: 58e16b7dbc1c31f4585e11544cdce127, type: 3}
+    - {fileID: 3613456606582262254, guid: 58e16b7dbc1c31f4585e11544cdce127, type: 3}
+    - {fileID: 7558371940554398246, guid: 58e16b7dbc1c31f4585e11544cdce127, type: 3}
+    - {fileID: -3774795931012705877, guid: 58e16b7dbc1c31f4585e11544cdce127, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_used.sbsar b/Assets/Materials/Substance/Metal/metal_used.sbsar
new file mode 100644
index 000000000..5a8b87d9c
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_used.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:03b72a9708206dd2c10aba185b507def52bbbcb713666711ed5d67926fbedd68
+size 14332
diff --git a/Assets/Materials/Substance/Metal/metal_used.sbsar.meta b/Assets/Materials/Substance/Metal/metal_used.sbsar.meta
new file mode 100644
index 000000000..30f356508
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_used.sbsar.meta
@@ -0,0 +1,371 @@
+fileFormatVersion: 2
+guid: 130f566ffa0b2424fbb47de2194c136a
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_used/metal_used
+  - first:
+      4: 400000
+    second: metal_used/metal_used/Transform
+  - first:
+      21: 2100000
+    second: mat.Metal used
+  - first:
+      23: 2300000
+    second: metal_used/metal_used/MeshRenderer
+  - first:
+      28: 2800000
+    second: Metal used_baseColor
+  - first:
+      28: 2800002
+    second: Metal used_normal
+  - first:
+      28: 2800004
+    second: Metal used_metallic
+  - first:
+      28: 2800006
+    second: Metal used_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Metal used_height
+  - first:
+      33: 3300000
+    second: metal_used/metal_used/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_used/metal_used/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_used
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Metal used
+    prototypeName: Metal used
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_used\" label=\"\" >\n  <presetinput
+      identifier=\"$outputsize\" uid=\"2490862535\" type=\"8\" value=\"9,9\" />\n
+      </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 8398852885706109728, guid: 130f566ffa0b2424fbb47de2194c136a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 8357651109123355072, guid: 130f566ffa0b2424fbb47de2194c136a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -435054815742279573, guid: 130f566ffa0b2424fbb47de2194c136a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 6248133906606842143, guid: 130f566ffa0b2424fbb47de2194c136a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 2780512161145013460, guid: 130f566ffa0b2424fbb47de2194c136a,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Metal used_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal used - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 512
+      textureHeight: 512
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -890370705972978167, guid: 130f566ffa0b2424fbb47de2194c136a,
+      type: 3}
+    generatedTextures:
+    - {fileID: 8357651109123355072, guid: 130f566ffa0b2424fbb47de2194c136a, type: 3}
+    - {fileID: 8398852885706109728, guid: 130f566ffa0b2424fbb47de2194c136a, type: 3}
+    - {fileID: -435054815742279573, guid: 130f566ffa0b2424fbb47de2194c136a, type: 3}
+    - {fileID: 6248133906606842143, guid: 130f566ffa0b2424fbb47de2194c136a, type: 3}
+    - {fileID: 2780512161145013460, guid: 130f566ffa0b2424fbb47de2194c136a, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_weapon.sbsar b/Assets/Materials/Substance/Metal/metal_weapon.sbsar
new file mode 100644
index 000000000..d96236940
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_weapon.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e9033843201f75f1b86df82b69fd89ee6b9aa317df18f9105d0f8904d56be8f
+size 10547
diff --git a/Assets/Materials/Substance/Metal/metal_weapon.sbsar.meta b/Assets/Materials/Substance/Metal/metal_weapon.sbsar.meta
new file mode 100644
index 000000000..05a55c60c
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_weapon.sbsar.meta
@@ -0,0 +1,373 @@
+fileFormatVersion: 2
+guid: 07f679eadba9fb14abac26b1e165f7d5
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_weapon/metal_weapon
+  - first:
+      4: 400000
+    second: metal_weapon/metal_weapon/Transform
+  - first:
+      21: 2100000
+    second: mat.Metal Weapon
+  - first:
+      23: 2300000
+    second: metal_weapon/metal_weapon/MeshRenderer
+  - first:
+      28: 2800000
+    second: Metal Weapon_baseColor
+  - first:
+      28: 2800002
+    second: Metal Weapon_normal
+  - first:
+      28: 2800004
+    second: Metal Weapon_metallic
+  - first:
+      28: 2800006
+    second: Metal Weapon_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Metal Weapon_height
+  - first:
+      33: 3300000
+    second: metal_weapon/metal_weapon/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_weapon/metal_weapon/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_weapon
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Metal Weapon
+    prototypeName: Metal Weapon
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_weapon\" label=\"\" >\n  <presetinput
+      identifier=\"dirt\" uid=\"2667454443\" type=\"0\" value=\"0.46\" />\n  <presetinput
+      identifier=\"scratches\" uid=\"3780562351\" type=\"0\" value=\"1\" />\n  <presetinput
+      identifier=\"metal_roughness\" uid=\"3861636079\" type=\"0\" value=\"0.4\"
+      />\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -6635831357954291190, guid: 07f679eadba9fb14abac26b1e165f7d5,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -6402586014670071135, guid: 07f679eadba9fb14abac26b1e165f7d5,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 854616604008364032, guid: 07f679eadba9fb14abac26b1e165f7d5,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 4606406952830974004, guid: 07f679eadba9fb14abac26b1e165f7d5,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -5822151887330517421, guid: 07f679eadba9fb14abac26b1e165f7d5,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Metal Weapon_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal Weapon - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -6659110875122461561, guid: 07f679eadba9fb14abac26b1e165f7d5,
+      type: 3}
+    generatedTextures:
+    - {fileID: -6402586014670071135, guid: 07f679eadba9fb14abac26b1e165f7d5, type: 3}
+    - {fileID: -6635831357954291190, guid: 07f679eadba9fb14abac26b1e165f7d5, type: 3}
+    - {fileID: 854616604008364032, guid: 07f679eadba9fb14abac26b1e165f7d5, type: 3}
+    - {fileID: 4606406952830974004, guid: 07f679eadba9fb14abac26b1e165f7d5, type: 3}
+    - {fileID: -5822151887330517421, guid: 07f679eadba9fb14abac26b1e165f7d5, type: 3}
diff --git a/Assets/Materials/Substance/Metal/metal_woven.sbsar b/Assets/Materials/Substance/Metal/metal_woven.sbsar
new file mode 100644
index 000000000..576f8c4a5
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_woven.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c50e25516df1c3d2cb879d4e3e78491462296d92f05ac5774b6aa1290a777ee
+size 9445
diff --git a/Assets/Materials/Substance/Metal/metal_woven.sbsar.meta b/Assets/Materials/Substance/Metal/metal_woven.sbsar.meta
new file mode 100644
index 000000000..a6763cd64
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/metal_woven.sbsar.meta
@@ -0,0 +1,369 @@
+fileFormatVersion: 2
+guid: deb7e15e5f95294498d18869d9f11302
+ScriptedImporter:
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: metal_woven/metal_woven
+  - first:
+      4: 400000
+    second: metal_woven/metal_woven/Transform
+  - first:
+      21: 2100000
+    second: mat.Metal woven
+  - first:
+      23: 2300000
+    second: metal_woven/metal_woven/MeshRenderer
+  - first:
+      28: 2800000
+    second: Metal woven_baseColor
+  - first:
+      28: 2800002
+    second: Metal woven_normal
+  - first:
+      28: 2800004
+    second: Metal woven_metallic
+  - first:
+      28: 2800006
+    second: Metal woven_ambientOcclusion
+  - first:
+      28: 2800008
+    second: Metal woven_height
+  - first:
+      33: 3300000
+    second: metal_woven/metal_woven/MeshFilter
+  - first:
+      114: 11400000
+    second: sbsar
+  - first:
+      114: 11400002
+    second: graph0
+  - first:
+      135: 13500000
+    second: metal_woven/metal_woven/SphereCollider
+  - first:
+      1001: 100100000
+    second: metal_woven
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Metal woven
+    prototypeName: Metal woven
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://metal_woven\" label=\"\" >\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 549858149917880910, guid: deb7e15e5f95294498d18869d9f11302,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -5021036940690714266, guid: deb7e15e5f95294498d18869d9f11302,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -4741193760961545063, guid: deb7e15e5f95294498d18869d9f11302,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 4441773978818050154, guid: deb7e15e5f95294498d18869d9f11302,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -8782013540898460330, guid: deb7e15e5f95294498d18869d9f11302,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambient_occlusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Metal woven_glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven_diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven_baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven_normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven_specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven_roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven_metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven_ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven_height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Metal woven - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 256
+      textureHeight: 256
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -1778075352807424672, guid: deb7e15e5f95294498d18869d9f11302,
+      type: 3}
+    generatedTextures:
+    - {fileID: -5021036940690714266, guid: deb7e15e5f95294498d18869d9f11302, type: 3}
+    - {fileID: 549858149917880910, guid: deb7e15e5f95294498d18869d9f11302, type: 3}
+    - {fileID: -4741193760961545063, guid: deb7e15e5f95294498d18869d9f11302, type: 3}
+    - {fileID: 4441773978818050154, guid: deb7e15e5f95294498d18869d9f11302, type: 3}
+    - {fileID: -8782013540898460330, guid: deb7e15e5f95294498d18869d9f11302, type: 3}
diff --git a/Assets/Materials/Substance/Metal/snatched_metal.sbsar b/Assets/Materials/Substance/Metal/snatched_metal.sbsar
new file mode 100644
index 000000000..35980ce5c
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/snatched_metal.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:556e67022b660530d0afc8296e37706b09e9ef08db46b5421edbd80f0c8993f2
+size 28573
diff --git a/Assets/Materials/Substance/Metal/snatched_metal.sbsar.meta b/Assets/Materials/Substance/Metal/snatched_metal.sbsar.meta
new file mode 100644
index 000000000..c50fb10a8
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/snatched_metal.sbsar.meta
@@ -0,0 +1,311 @@
+fileFormatVersion: 2
+guid: 9aa51bbe4dd46874a906608c34a739e4
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Snatched Metal
+    prototypeName: Snatched Metal
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://snatched_metal\" label=\"\" >\n  <presetinput
+      identifier=\"$outputsize\" uid=\"755928508\" type=\"8\" value=\"9,9\" />\n
+      </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 8651868829797956950, guid: 9aa51bbe4dd46874a906608c34a739e4,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 3043754869544600785, guid: 9aa51bbe4dd46874a906608c34a739e4,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -8730703347107057792, guid: 9aa51bbe4dd46874a906608c34a739e4,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 8639218750153593357, guid: 9aa51bbe4dd46874a906608c34a739e4,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 8363912540366899318, guid: 9aa51bbe4dd46874a906608c34a739e4,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambientocclusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: opacity
+      identifier: opacity
+      usageName: opacity
+      channelStr: opacity
+      label: Opacity
+      usage: 2
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: opacity
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: opacity
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    - targetName: opacity
+      components:
+      - sourceName: opacity
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Snatched Metal - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Snatched Metal - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Snatched Metal - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Snatched Metal - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Snatched Metal - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Snatched Metal - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Snatched Metal - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Snatched Metal - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Snatched Metal - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Snatched Metal - opacity
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 512
+      textureHeight: 512
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -2363654054484809406, guid: 9aa51bbe4dd46874a906608c34a739e4,
+      type: 3}
+    generatedTextures:
+    - {fileID: 3043754869544600785, guid: 9aa51bbe4dd46874a906608c34a739e4, type: 3}
+    - {fileID: 8651868829797956950, guid: 9aa51bbe4dd46874a906608c34a739e4, type: 3}
+    - {fileID: -8730703347107057792, guid: 9aa51bbe4dd46874a906608c34a739e4, type: 3}
+    - {fileID: 8363912540366899318, guid: 9aa51bbe4dd46874a906608c34a739e4, type: 3}
+    - {fileID: 8639218750153593357, guid: 9aa51bbe4dd46874a906608c34a739e4, type: 3}
diff --git a/Assets/Materials/Substance/Metal/steel_heavy_corroded_(new).sbsar b/Assets/Materials/Substance/Metal/steel_heavy_corroded_(new).sbsar
new file mode 100644
index 000000000..b05a06c47
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/steel_heavy_corroded_(new).sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:355e1d7051fba0dbc51504f9113ff1ec6539cd055e3020c475c5b7132c287481
+size 21242
diff --git a/Assets/Materials/Substance/Metal/steel_heavy_corroded_(new).sbsar.meta b/Assets/Materials/Substance/Metal/steel_heavy_corroded_(new).sbsar.meta
new file mode 100644
index 000000000..e40518e2f
--- /dev/null
+++ b/Assets/Materials/Substance/Metal/steel_heavy_corroded_(new).sbsar.meta
@@ -0,0 +1,293 @@
+fileFormatVersion: 2
+guid: f0a9920571495c940965f48653f85d3d
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Steel Heavy Corroded
+    prototypeName: Steel Heavy Corroded
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://steel_heavy_corroded\" label=\"\" >\n  <presetinput
+      identifier=\"$outputsize\" uid=\"3910662582\" type=\"8\" value=\"10,10\" />\n
+      </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -6250493520227015852, guid: f0a9920571495c940965f48653f85d3d,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 5642339609094786632, guid: f0a9920571495c940965f48653f85d3d,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 1507023741296766539, guid: f0a9920571495c940965f48653f85d3d,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -898852217572229787, guid: f0a9920571495c940965f48653f85d3d,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -294547537875204696, guid: f0a9920571495c940965f48653f85d3d,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambientocclusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Steel Heavy Corroded - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel Heavy Corroded - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel Heavy Corroded - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel Heavy Corroded - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel Heavy Corroded - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel Heavy Corroded - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel Heavy Corroded - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel Heavy Corroded - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Steel Heavy Corroded - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 1024
+      textureHeight: 1024
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 6568813393593380970, guid: f0a9920571495c940965f48653f85d3d,
+      type: 3}
+    generatedTextures:
+    - {fileID: 5642339609094786632, guid: f0a9920571495c940965f48653f85d3d, type: 3}
+    - {fileID: -6250493520227015852, guid: f0a9920571495c940965f48653f85d3d, type: 3}
+    - {fileID: 1507023741296766539, guid: f0a9920571495c940965f48653f85d3d, type: 3}
+    - {fileID: -294547537875204696, guid: f0a9920571495c940965f48653f85d3d, type: 3}
+    - {fileID: -898852217572229787, guid: f0a9920571495c940965f48653f85d3d, type: 3}
diff --git a/Assets/Materials/Substance/space_station_outer_panel.sbsar b/Assets/Materials/Substance/space_station_outer_panel.sbsar
new file mode 100644
index 000000000..5168a25b9
--- /dev/null
+++ b/Assets/Materials/Substance/space_station_outer_panel.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5773c19fc0905e15a1de185e5d604cb5c4f360c08f3c9a4bb6b015291c559af9
+size 523821
diff --git a/Assets/Materials/Substance/space_station_outer_panel.sbsar.meta b/Assets/Materials/Substance/space_station_outer_panel.sbsar.meta
new file mode 100644
index 000000000..2194f8328
--- /dev/null
+++ b/Assets/Materials/Substance/space_station_outer_panel.sbsar.meta
@@ -0,0 +1,293 @@
+fileFormatVersion: 2
+guid: fa6817020c12a5d4caf2ec45a847c2cd
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Space Station Outer Panel
+    prototypeName: Space Station Outer Panel
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://space_station_outer_panel\" label=\"\" >\n 
+      <presetinput identifier=\"$outputsize\" uid=\"951392384\" type=\"8\" value=\"9,9\"
+      />\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: -8561690993314157676, guid: fa6817020c12a5d4caf2ec45a847c2cd,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: -301347381319941836, guid: fa6817020c12a5d4caf2ec45a847c2cd,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -3438327597553639960, guid: fa6817020c12a5d4caf2ec45a847c2cd,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 2085437806914445337, guid: fa6817020c12a5d4caf2ec45a847c2cd,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -4838959782630947568, guid: fa6817020c12a5d4caf2ec45a847c2cd,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambientocclusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Space Station Outer Panel - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Space Station Outer Panel - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Space Station Outer Panel - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Space Station Outer Panel - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Space Station Outer Panel - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Space Station Outer Panel - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Space Station Outer Panel - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Space Station Outer Panel - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Space Station Outer Panel - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 512
+      textureHeight: 512
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 4925445507380793097, guid: fa6817020c12a5d4caf2ec45a847c2cd,
+      type: 3}
+    generatedTextures:
+    - {fileID: -301347381319941836, guid: fa6817020c12a5d4caf2ec45a847c2cd, type: 3}
+    - {fileID: -8561690993314157676, guid: fa6817020c12a5d4caf2ec45a847c2cd, type: 3}
+    - {fileID: -3438327597553639960, guid: fa6817020c12a5d4caf2ec45a847c2cd, type: 3}
+    - {fileID: -4838959782630947568, guid: fa6817020c12a5d4caf2ec45a847c2cd, type: 3}
+    - {fileID: 2085437806914445337, guid: fa6817020c12a5d4caf2ec45a847c2cd, type: 3}
diff --git a/Assets/Materials/Substance/space_station_solar_array.sbsar b/Assets/Materials/Substance/space_station_solar_array.sbsar
new file mode 100644
index 000000000..48e692484
--- /dev/null
+++ b/Assets/Materials/Substance/space_station_solar_array.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aab97308ec60cdb98a38a8e043ea7628bcd13df77c9ae2fc118ceaf579119b1b
+size 26864
diff --git a/Assets/Materials/Substance/space_station_solar_array.sbsar.meta b/Assets/Materials/Substance/space_station_solar_array.sbsar.meta
new file mode 100644
index 000000000..9458bc27e
--- /dev/null
+++ b/Assets/Materials/Substance/space_station_solar_array.sbsar.meta
@@ -0,0 +1,293 @@
+fileFormatVersion: 2
+guid: 9daa2d129bf252049b25421b3cdf0e1d
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Space Station Solar Array
+    prototypeName: Space Station Solar Array
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://space_station_solar_array\" label=\"\" >\n 
+      <presetinput identifier=\"$outputsize\" uid=\"1009159302\" type=\"8\" value=\"9,9\"
+      />\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 290813146022453596, guid: 9daa2d129bf252049b25421b3cdf0e1d,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 8328722744182643979, guid: 9daa2d129bf252049b25421b3cdf0e1d,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: -556858595250500920, guid: 9daa2d129bf252049b25421b3cdf0e1d,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: -4180144747078302841, guid: 9daa2d129bf252049b25421b3cdf0e1d,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: -7254159831354095485, guid: 9daa2d129bf252049b25421b3cdf0e1d,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambientocclusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Space Station Solar Array - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Space Station Solar Array - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Space Station Solar Array - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Space Station Solar Array - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Space Station Solar Array - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Space Station Solar Array - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Space Station Solar Array - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Space Station Solar Array - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Space Station Solar Array - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 512
+      textureHeight: 512
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: -3972444280483723186, guid: 9daa2d129bf252049b25421b3cdf0e1d,
+      type: 3}
+    generatedTextures:
+    - {fileID: 8328722744182643979, guid: 9daa2d129bf252049b25421b3cdf0e1d, type: 3}
+    - {fileID: 290813146022453596, guid: 9daa2d129bf252049b25421b3cdf0e1d, type: 3}
+    - {fileID: -556858595250500920, guid: 9daa2d129bf252049b25421b3cdf0e1d, type: 3}
+    - {fileID: -7254159831354095485, guid: 9daa2d129bf252049b25421b3cdf0e1d, type: 3}
+    - {fileID: -4180144747078302841, guid: 9daa2d129bf252049b25421b3cdf0e1d, type: 3}
diff --git a/Assets/Materials/Substance/thermal_insulation_panel.sbsar b/Assets/Materials/Substance/thermal_insulation_panel.sbsar
new file mode 100644
index 000000000..77a89f3c3
--- /dev/null
+++ b/Assets/Materials/Substance/thermal_insulation_panel.sbsar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7d7ad9614b5fbd0368f6816610321fc23db6ab88d2f79a03c360d90174a71e0a
+size 507869
diff --git a/Assets/Materials/Substance/thermal_insulation_panel.sbsar.meta b/Assets/Materials/Substance/thermal_insulation_panel.sbsar.meta
new file mode 100644
index 000000000..547bcdf21
--- /dev/null
+++ b/Assets/Materials/Substance/thermal_insulation_panel.sbsar.meta
@@ -0,0 +1,293 @@
+fileFormatVersion: 2
+guid: 2ffa5f4fdaecbb146b62b670821cbb01
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 232528478, guid: 43a8bbf65be290d44ba52b94476242b9, type: 3}
+  version: 29
+  projectContext: 0
+  mGraphInstanceData:
+  - graphLabel: Thermal Insulation Panel
+    prototypeName: Thermal Insulation Panel
+    graphDescIndex: 0
+    generateAllOutputs: 0
+    generateMipMaps: 1
+    preset: " <sbspreset pkgurl=\"pkg://thermal_insulation_panel\" label=\"\" >\n 
+      <presetinput identifier=\"$outputsize\" uid=\"919375485\" type=\"8\" value=\"9,9\"
+      />\n </sbspreset>\n"
+    shaderName: Standard
+    materialProperties:
+      shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+      shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP
+      lightmapFlags: 4
+      enableInstancingVariants: 0
+      doubleSidedGI: 0
+      customRenderQueue: -1
+      texEnvs:
+      - name: _BumpMap
+        texture: {fileID: 4860743944344797152, guid: 2ffa5f4fdaecbb146b62b670821cbb01,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailAlbedoMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailMask
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _DetailNormalMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _EmissionMap
+        texture: {instanceID: 0}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MainTex
+        texture: {fileID: 549366835173182152, guid: 2ffa5f4fdaecbb146b62b670821cbb01,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _MetallicGlossMap
+        texture: {fileID: 1739654809496113928, guid: 2ffa5f4fdaecbb146b62b670821cbb01,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _OcclusionMap
+        texture: {fileID: 2258245820741535019, guid: 2ffa5f4fdaecbb146b62b670821cbb01,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      - name: _ParallaxMap
+        texture: {fileID: 3003097890909754445, guid: 2ffa5f4fdaecbb146b62b670821cbb01,
+          type: 3}
+        scale: {x: 1, y: 1}
+        offset: {x: 0, y: 0}
+      floats:
+      - name: _BumpScale
+        float: 1
+      - name: _Cutoff
+        float: 0.5
+      - name: _DetailNormalMapScale
+        float: 1
+      - name: _DstBlend
+        float: 0
+      - name: _GlossMapScale
+        float: 1
+      - name: _Glossiness
+        float: 0.5
+      - name: _GlossyReflections
+        float: 1
+      - name: _Metallic
+        float: 0
+      - name: _Mode
+        float: 0
+      - name: _OcclusionStrength
+        float: 1
+      - name: _Parallax
+        float: 0.02
+      - name: _SmoothnessTextureChannel
+        float: 0
+      - name: _SpecularHighlights
+        float: 1
+      - name: _SrcBlend
+        float: 1
+      - name: _UVSec
+        float: 0
+      - name: _ZWrite
+        float: 1
+      colors:
+      - name: _Color
+        color: {r: 1, g: 1, b: 1, a: 1}
+      - name: _EmissionColor
+        color: {r: 0, g: 0, b: 0, a: 1}
+    outputDescList:
+    - outputName: diffuse
+      identifier: diffuse
+      usageName: diffuse
+      channelStr: diffuse
+      label: Diffuse
+      usage: 0
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: baseColor
+      identifier: basecolor
+      usageName: baseColor
+      channelStr: baseColor
+      label: Base Color
+      usage: 1
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: normal
+      identifier: normal
+      usageName: normal
+      channelStr: normal
+      label: Normal
+      usage: 7
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: specular
+      identifier: specular
+      usageName: specular
+      channelStr: specular
+      label: Specular
+      usage: 11
+      bImage: 1
+      bNumerical: 0
+      bLinear: 0
+    - outputName: glossiness
+      identifier: glossiness
+      usageName: glossiness
+      channelStr: glossiness
+      label: Glossiness
+      usage: 14
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: roughness
+      identifier: roughness
+      usageName: roughness
+      channelStr: roughness
+      label: Roughness
+      usage: 15
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: metallic
+      identifier: metallic
+      usageName: metallic
+      channelStr: metallic
+      label: Metallic
+      usage: 34
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: height
+      identifier: height
+      usageName: height
+      channelStr: height
+      label: Height
+      usage: 9
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    - outputName: ambientOcclusion
+      identifier: ambientocclusion
+      usageName: ambientOcclusion
+      channelStr: ambientOcclusion
+      label: Ambient Occlusion
+      usage: 5
+      bImage: 1
+      bNumerical: 0
+      bLinear: 1
+    texturePackingList:
+    - targetName: diffuse
+      components:
+      - sourceName: diffuse
+        from: 0
+        to: 3
+    - targetName: baseColor
+      components:
+      - sourceName: baseColor
+        from: 0
+        to: 3
+    - targetName: normal
+      components:
+      - sourceName: normal
+        from: 0
+        to: 3
+    - targetName: specular
+      components:
+      - sourceName: specular
+        from: 0
+        to: 3
+    - targetName: glossiness
+      components:
+      - sourceName: glossiness
+        from: 0
+        to: 3
+    - targetName: roughness
+      components:
+      - sourceName: roughness
+        from: 0
+        to: 3
+    - targetName: metallic
+      components:
+      - sourceName: smoothness
+        from: 0
+        to: 3
+    - targetName: height
+      components:
+      - sourceName: height
+        from: 0
+        to: 3
+    - targetName: ambientOcclusion
+      components:
+      - sourceName: ambientOcclusion
+        from: 0
+        to: 3
+    textureParameters:
+    - textureName: Thermal Insulation Panel - diffuse
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Thermal Insulation Panel - baseColor
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Thermal Insulation Panel - normal
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Thermal Insulation Panel - specular
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Thermal Insulation Panel - glossiness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Thermal Insulation Panel - roughness
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Thermal Insulation Panel - metallic
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Thermal Insulation Panel - height
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    - textureName: Thermal Insulation Panel - ambientOcclusion
+      wrapMode: 0
+      filterMode: 1
+      aniso: 1
+    colorSpaceList: []
+    inputTextureMap: []
+    targetSettingList:
+    - label: Default
+      bOverride: 0
+      bLockRatio: 1
+      textureWidth: 512
+      textureHeight: 512
+      textureFormatMode: 0
+      normalCompressed: 0
+      bGenerateOnLoad: 1
+    material: {fileID: 2878713379736320278, guid: 2ffa5f4fdaecbb146b62b670821cbb01,
+      type: 3}
+    generatedTextures:
+    - {fileID: 549366835173182152, guid: 2ffa5f4fdaecbb146b62b670821cbb01, type: 3}
+    - {fileID: 4860743944344797152, guid: 2ffa5f4fdaecbb146b62b670821cbb01, type: 3}
+    - {fileID: 1739654809496113928, guid: 2ffa5f4fdaecbb146b62b670821cbb01, type: 3}
+    - {fileID: 3003097890909754445, guid: 2ffa5f4fdaecbb146b62b670821cbb01, type: 3}
+    - {fileID: 2258245820741535019, guid: 2ffa5f4fdaecbb146b62b670821cbb01, type: 3}
diff --git a/Assets/Materials/Thrusters.mat b/Assets/Materials/Thrusters.mat
new file mode 100644
index 000000000..540673470
--- /dev/null
+++ b/Assets/Materials/Thrusters.mat
@@ -0,0 +1,87 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Thrusters
+  m_Shader: {fileID: 4800000, guid: d69ef48273708ef4680762f5cdcfc860, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: -812895718602229137, guid: b7e648471e9dfc44490bd41973711541,
+          type: 3}
+        m_Scale: {x: 8, y: 8}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: -6057190860509678031, guid: 2b42584452fe0cc4fa4e8a115230b156,
+          type: 3}
+        m_Scale: {x: 8, y: 8}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: -894214952450941493, guid: 2b42584452fe0cc4fa4e8a115230b156,
+          type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpPower: 2
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _Emission: 15
+    - _EmissionFresnel: 4
+    - _EmissionRoughnessFresnelPower: 0.5
+    - _GlossMapScale: 1
+    - _Glossiness: 1
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _ReverseRim: 0
+    - _Rotation: 0
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0.7112653, g: 0.4292453, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Materials/Thrusters.mat.meta b/Assets/Materials/Thrusters.mat.meta
new file mode 100644
index 000000000..5fd79a1be
--- /dev/null
+++ b/Assets/Materials/Thrusters.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 616adaf59c64a444f8249cc7cf13c527
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Materials/UI/Minimap Background.mat b/Assets/Materials/UI/Minimap Background.mat
new file mode 100644
index 000000000..2dab68e58
--- /dev/null
+++ b/Assets/Materials/UI/Minimap Background.mat	
@@ -0,0 +1,80 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Minimap Background
+  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 8400000, guid: d196505464047f04a97f28689041209b, type: 2}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _InvFade: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _TintColor: {r: 0.255, g: 0.255, b: 0.255, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Materials/UI/Minimap Background.mat.meta b/Assets/Materials/UI/Minimap Background.mat.meta
new file mode 100644
index 000000000..b7b705abf
--- /dev/null
+++ b/Assets/Materials/UI/Minimap Background.mat.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8a05cab4a67d31340a22eb222e5d86aa
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Models/Djinni.fbx b/Assets/Models/Djinni.fbx
new file mode 100644
index 000000000..b96f8e113
--- /dev/null
+++ b/Assets/Models/Djinni.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:03979aaf613935caa73e27c9de36d09000e14a3c8f900a60f9c37591f83847ae
+size 1858588
diff --git a/Assets/Models/Djinni.fbx.meta b/Assets/Models/Djinni.fbx.meta
new file mode 100644
index 000000000..9314394e5
--- /dev/null
+++ b/Assets/Models/Djinni.fbx.meta
@@ -0,0 +1,101 @@
+fileFormatVersion: 2
+guid: caefaa8e0cbce524f97eb0db4be80a98
+ModelImporter:
+  serializedVersion: 20101
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 1
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Resources/Fog Tint.renderTexture b/Assets/Resources/Fog Tint.renderTexture
index 33c052cf7..81bbea5f7 100644
--- a/Assets/Resources/Fog Tint.renderTexture	
+++ b/Assets/Resources/Fog Tint.renderTexture	
@@ -18,7 +18,7 @@ RenderTexture:
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthFormat: 0
-  m_ColorFormat: 8
+  m_ColorFormat: 74
   m_MipMap: 0
   m_GenerateMips: 1
   m_SRGB: 0
diff --git a/Assets/Resources/Minimap.renderTexture b/Assets/Resources/Minimap.renderTexture
index 377298e8f..2f0d0c5cb 100644
--- a/Assets/Resources/Minimap.renderTexture
+++ b/Assets/Resources/Minimap.renderTexture
@@ -18,7 +18,7 @@ RenderTexture:
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthFormat: 2
-  m_ColorFormat: 69
+  m_ColorFormat: 74
   m_MipMap: 1
   m_GenerateMips: 1
   m_SRGB: 0
diff --git a/Assets/Scenes/ARPG.unity b/Assets/Scenes/ARPG.unity
index 2c39db5d4..b896df24e 100644
--- a/Assets/Scenes/ARPG.unity
+++ b/Assets/Scenes/ARPG.unity
@@ -8116,6 +8116,137 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 690092968}
   m_CullTransparentMesh: 0
+--- !u!1001 &691453770
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 1547.9908
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 799.0965
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2571.4744
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_Name
+      value: Djinni
+      objectReference: {fileID: 0}
+    - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 7852708265981260911, guid: ea7457b9a4f0bcb43becaa33de541cbd,
+        type: 3}
+    - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_Materials.Array.data[1]
+      value: 
+      objectReference: {fileID: 3720744386649352057, guid: b2bec4b400153d745b2915f1c43e5c96,
+        type: 3}
+    - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_Materials.Array.data[5]
+      value: 
+      objectReference: {fileID: -905690159841262435, guid: a74970be876d3554ea0f279f39314c9c,
+        type: 3}
+    - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_Materials.Array.data[2]
+      value: 
+      objectReference: {fileID: 7852708265981260911, guid: ea7457b9a4f0bcb43becaa33de541cbd,
+        type: 3}
+    - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_Materials.Array.data[4]
+      value: 
+      objectReference: {fileID: 2100000, guid: a76a85450aa271448a72b7dfeec9ff53, type: 2}
+    - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_Materials.Array.data[3]
+      value: 
+      objectReference: {fileID: 2100000, guid: 616adaf59c64a444f8249cc7cf13c527, type: 2}
+    - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_Materials.Array.data[6]
+      value: 
+      objectReference: {fileID: 2100000, guid: 761295ee40506ed489244e2dd3b73158, type: 2}
+    - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_Materials.Array.data[7]
+      value: 
+      objectReference: {fileID: -741235592913766832, guid: 885e680924fc12c439a842a2142d4b78,
+        type: 3}
+    - target: {fileID: 2115218557376454651, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_Materials.Array.data[8]
+      value: 
+      objectReference: {fileID: 2100000, guid: b9036e605cc538943a8c7bec97257e87, type: 2}
+    - target: {fileID: 6947464325843983966, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: -741235592913766832, guid: 885e680924fc12c439a842a2142d4b78,
+        type: 3}
+    - target: {fileID: 6947464325843983966, guid: caefaa8e0cbce524f97eb0db4be80a98,
+        type: 3}
+      propertyPath: m_Materials.Array.data[1]
+      value: 
+      objectReference: {fileID: 3720744386649352057, guid: b2bec4b400153d745b2915f1c43e5c96,
+        type: 3}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: caefaa8e0cbce524f97eb0db4be80a98, type: 3}
 --- !u!1 &713373301
 GameObject:
   m_ObjectHideFlags: 0
@@ -10805,6 +10936,136 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 2
+--- !u!1 &914630718
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 914630719}
+  - component: {fileID: 914630724}
+  - component: {fileID: 914630723}
+  - component: {fileID: 914630722}
+  - component: {fileID: 914630721}
+  - component: {fileID: 914630720}
+  m_Layer: 14
+  m_Name: Minimap Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &914630719
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 914630718}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: -0.7071068, w: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2095699057}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 90, y: 180, z: 0}
+--- !u!114 &914630720
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 914630718}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7ec4eea2d4fa2f64f80e17d11987e6f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Target: {fileID: 39508928}
+  CopyXPosition: 1
+  CopyYPosition: 0
+  CopyZPosition: 1
+  CopyRotation: 0
+  PixelSnapCamera: {fileID: 0}
+  PixelSnapIncrement: 1
+--- !u!114 &914630721
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 914630718}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ab5a36d7c56c02b448b17592b3ab8857, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Camera: {fileID: 39508929}
+--- !u!64 &914630722
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 914630718}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &914630723
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 914630718}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 8a05cab4a67d31340a22eb222e5d86aa, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &914630724
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 914630718}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &937280107
 GameObject:
   m_ObjectHideFlags: 0
@@ -11787,7 +12048,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1009503731
 MonoBehaviour:
@@ -11807,6 +12068,7 @@ MonoBehaviour:
   SectorBrushes: {fileID: 1037490739}
   SectorBoundaryBrush: {fileID: 1476765550}
   MinimapGravityQuad: {fileID: 509767789}
+  MinimapTintQuad: {fileID: 914630723}
   SceneCamera: {fileID: 887677622}
   FogCameras:
   - {fileID: 559840917}
@@ -12013,6 +12275,7 @@ MonoBehaviour:
   Minimap: {fileID: 970624071}
   GravityRenderer: {fileID: 509767789}
   ZoomSpeed: 0.001
+  SectorRenderer: {fileID: 1009503731}
 --- !u!114 &1009503735
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -12401,7 +12664,7 @@ Transform:
   - {fileID: 1108843909}
   - {fileID: 1647230682}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!1001 &1046403180
 PrefabInstance:
@@ -13854,8 +14117,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_NoiseProfile: {fileID: 11400000, guid: 46965f9cbaf525742a6da4c2172a99cd, type: 2}
   m_PivotOffset: {x: 0, y: 0, z: 0}
-  m_AmplitudeGain: 1
-  m_FrequencyGain: 1
+  m_AmplitudeGain: 0.25
+  m_FrequencyGain: 0.5
   mNoiseOffsets: {x: 0, y: 0, z: 0}
 --- !u!114 &1319157837
 MonoBehaviour:
@@ -18615,7 +18878,7 @@ Transform:
   - {fileID: 1547889399}
   - {fileID: 199435031}
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1671945471
 GameObject:
@@ -22927,8 +23190,9 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 509767791}
+  - {fileID: 914630719}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &2098141212
 PrefabInstance:
diff --git a/Assets/Scripts/ActionGameManager.cs b/Assets/Scripts/ActionGameManager.cs
index c60c8d034..f85ee9286 100644
--- a/Assets/Scripts/ActionGameManager.cs
+++ b/Assets/Scripts/ActionGameManager.cs
@@ -28,7 +28,7 @@ public class ActionGameManager : MonoBehaviour
     private int _zoomLevelIndex;
     
     public DatabaseCache Cache { get; private set; }
-    public GameContext Context { get; private set; }
+    public ItemManager Context { get; private set; }
     public Zone Zone { get; private set; }
 
     void Start()
@@ -37,7 +37,7 @@ public class ActionGameManager : MonoBehaviour
         _filePath = new DirectoryInfo(Application.dataPath).Parent.CreateSubdirectory("GameData");
         Cache = new DatabaseCache();
         Cache.Load(_filePath.FullName);
-        Context = new GameContext(Cache, Debug.Log);
+        Context = new ItemManager(Cache, Settings.GameplaySettings, Debug.Log);
 
         var zoneFile = Path.Combine(_filePath.FullName, "Home.zone");
         
@@ -46,8 +46,8 @@ public class ActionGameManager : MonoBehaviour
             MessagePackSerializer.Deserialize<ZonePack>(File.ReadAllBytes(zoneFile)) : 
             ZoneGenerator.GenerateZone(
                 settings: Settings.ZoneSettings,
-                mapLayers: Context.MapLayers,
-                resources: Context.Resources,
+                // mapLayers: Context.MapLayers,
+                // resources: Context.Resources,
                 mass: Settings.DefaultZoneMass,
                 radius: Settings.DefaultZoneRadius
             );
@@ -79,6 +79,7 @@ public class ActionGameManager : MonoBehaviour
             else
             {
                 _input.Player.Enable();
+                SectorRenderer.ViewDistance = Settings.DefaultViewDistance;
                 SectorRenderer.MinimapDistance = Settings.MinimapZoomLevels[_zoomLevelIndex];
             }
         };
diff --git a/Assets/Scripts/Editor/DatabaseInspector.cs b/Assets/Scripts/Editor/DatabaseInspector.cs
index e1f9ba75f..3ba2ca059 100644
--- a/Assets/Scripts/Editor/DatabaseInspector.cs
+++ b/Assets/Scripts/Editor/DatabaseInspector.cs
@@ -60,31 +60,31 @@ public class DatabaseInspector : EditorWindow
             Inspect(obj, field, inspectablesOnly);
         }
 
-        if (obj is GalaxyMapLayerData mapLayer)
-        {
-            var global = DatabaseCache.GetAll<GlobalData>().FirstOrDefault();
-            if (global != null)
-            {
-                GUILayout.Label("Preview", EditorStyles.boldLabel);
-                _galaxyMat.SetFloat("Arms", global.Arms);
-                _galaxyMat.SetFloat("Twist", global.Twist);
-                _galaxyMat.SetFloat("TwistPower", global.TwistPower);
-                _galaxyMat.SetFloat("SpokeOffset", mapLayer.SpokeOffset);
-                _galaxyMat.SetFloat("SpokeScale", mapLayer.SpokeScale);
-                _galaxyMat.SetFloat("CoreBoost", mapLayer.CoreBoost);
-                _galaxyMat.SetFloat("CoreBoostOffset", mapLayer.CoreBoostOffset);
-                _galaxyMat.SetFloat("CoreBoostPower", mapLayer.CoreBoostPower);
-                _galaxyMat.SetFloat("EdgeReduction", mapLayer.EdgeReduction);
-                _galaxyMat.SetFloat("NoisePosition", mapLayer.NoisePosition);
-                _galaxyMat.SetFloat("NoiseAmplitude", mapLayer.NoiseAmplitude);
-                _galaxyMat.SetFloat("NoiseOffset", mapLayer.NoiseOffset);
-                _galaxyMat.SetFloat("NoiseGain", mapLayer.NoiseGain);
-                _galaxyMat.SetFloat("NoiseLacunarity", mapLayer.NoiseLacunarity);
-                _galaxyMat.SetFloat("NoiseFrequency", mapLayer.NoiseFrequency);
-                var rect = GetControlRect(false, Screen.width);
-                EditorGUI.DrawPreviewTexture(rect, _white, _galaxyMat);
-            }
-        }
+        // if (obj is GalaxyMapLayerData mapLayer)
+        // {
+        //     var global = DatabaseCache.GetAll<GlobalData>().FirstOrDefault();
+        //     if (global != null)
+        //     {
+        //         GUILayout.Label("Preview", EditorStyles.boldLabel);
+        //         _galaxyMat.SetFloat("Arms", global.Arms);
+        //         _galaxyMat.SetFloat("Twist", global.Twist);
+        //         _galaxyMat.SetFloat("TwistPower", global.TwistPower);
+        //         _galaxyMat.SetFloat("SpokeOffset", mapLayer.SpokeOffset);
+        //         _galaxyMat.SetFloat("SpokeScale", mapLayer.SpokeScale);
+        //         _galaxyMat.SetFloat("CoreBoost", mapLayer.CoreBoost);
+        //         _galaxyMat.SetFloat("CoreBoostOffset", mapLayer.CoreBoostOffset);
+        //         _galaxyMat.SetFloat("CoreBoostPower", mapLayer.CoreBoostPower);
+        //         _galaxyMat.SetFloat("EdgeReduction", mapLayer.EdgeReduction);
+        //         _galaxyMat.SetFloat("NoisePosition", mapLayer.NoisePosition);
+        //         _galaxyMat.SetFloat("NoiseAmplitude", mapLayer.NoiseAmplitude);
+        //         _galaxyMat.SetFloat("NoiseOffset", mapLayer.NoiseOffset);
+        //         _galaxyMat.SetFloat("NoiseGain", mapLayer.NoiseGain);
+        //         _galaxyMat.SetFloat("NoiseLacunarity", mapLayer.NoiseLacunarity);
+        //         _galaxyMat.SetFloat("NoiseFrequency", mapLayer.NoiseFrequency);
+        //         var rect = GetControlRect(false, Screen.width);
+        //         EditorGUI.DrawPreviewTexture(rect, _white, _galaxyMat);
+        //     }
+        // }
         
         if (obj is EquippableItemData equippableItemData)
         {
@@ -973,8 +973,8 @@ public class DatabaseInspector : EditorWindow
                     GUILayout.Label("", GUILayout.Width(width));
                     if (!isSimple)
                     {
-                        GUILayout.Label("H", _labelStyle);
-                        value.HeatDependent = Toggle(value.HeatDependent);
+                        // GUILayout.Label("H", _labelStyle);
+                        // value.HeatDependent = Toggle(value.HeatDependent);
                         GUILayout.Label("D", _labelStyle);
                         value.DurabilityDependent = Toggle(value.DurabilityDependent);
                         GUILayout.Label("QEx", _labelStyle, GUILayout.Width(labelWidth + 5));
@@ -1099,7 +1099,7 @@ public class DatabaseInspector : EditorWindow
                 Space();
                 using (var h = new HorizontalScope())
                 {
-                    GUILayout.Label($"Equipped Items: {loadout.Gear.Sum(i=>((ItemData) DatabaseCache.Get(i))?.Size ?? 0)}/{loadoutHull.Capacity.Min}", EditorStyles.boldLabel);
+                    // GUILayout.Label($"Equipped Items: {loadout.Gear.Sum(i=>((ItemData) DatabaseCache.Get(i))?.Size ?? 0)}/{loadoutHull.Capacity.Min}", EditorStyles.boldLabel);
                     GUILayout.Label($"Mass: {loadout.Gear.Sum(i=>((ItemData) DatabaseCache.Get(i))?.Mass ?? 0)}", EditorStyles.boldLabel, GUILayout.ExpandWidth(false));
                 }
         
diff --git a/Assets/Scripts/GameSettings.cs b/Assets/Scripts/GameSettings.cs
index 22e391700..40d11d5e2 100644
--- a/Assets/Scripts/GameSettings.cs
+++ b/Assets/Scripts/GameSettings.cs
@@ -19,6 +19,7 @@ public class GameSettings : ScriptableObject
     public BodySettingsCollection[] BodySettingsCollections;
     public PlanetSettings PlanetSettings;
     public ZoneGenerationSettings ZoneSettings;
+    public GameplaySettings GameplaySettings;
 }
 
 [Serializable]
diff --git a/Assets/Scripts/RethinkConnection.cs b/Assets/Scripts/RethinkConnection.cs
index 030910463..c4e992529 100644
--- a/Assets/Scripts/RethinkConnection.cs
+++ b/Assets/Scripts/RethinkConnection.cs
@@ -105,7 +105,6 @@ public static class RethinkConnection
             {
                 var filter = ((Table) operation).Filter(o =>
                     o["$type"] == typeof(GalaxyMapLayerData).Name || 
-                    o["$type"] == typeof(GlobalData).Name ||
                     o["$type"] == typeof(MegaCorporation).Name);
                 status.GalaxyEntries = filter.Count().RunAtom<int>(connection);
                 operation = filter;
diff --git a/Assets/Scripts/Sector Display/MapView.cs b/Assets/Scripts/Sector Display/MapView.cs
index eb0899f7b..d0ecf38eb 100644
--- a/Assets/Scripts/Sector Display/MapView.cs	
+++ b/Assets/Scripts/Sector Display/MapView.cs	
@@ -11,6 +11,7 @@ public class MapView : MonoBehaviour
     public Camera Minimap;
     public MeshRenderer GravityRenderer;
     public float ZoomSpeed;
+    public SectorRenderer SectorRenderer;
 
     private Transform _minimapTransform;
     private CopyTransform _minimapCopyTransform;
@@ -52,6 +53,7 @@ public class MapView : MonoBehaviour
 
     void SetZoom()
     {
+        SectorRenderer.ViewDistance = _viewDistance * _aspectRatio;
         Minimap.orthographicSize = MinimapGravity.orthographicSize = _viewDistance;
         _gravityRendererTransform.localScale = new Vector3(_viewDistance*_aspectRatio*2, _viewDistance*2, 1);
     }
@@ -83,7 +85,7 @@ public class MapView : MonoBehaviour
             gravPos.z = pos.z;
 
             _gravityRendererTransform.position = gravPos;
-            _minimapTransform.position = _minimapGravityTransform.position = pos;
+            Main.transform.position = _minimapTransform.position = _minimapGravityTransform.position = pos;
         }
     }
 
diff --git a/Assets/Scripts/Sector Display/SectorRenderer.cs b/Assets/Scripts/Sector Display/SectorRenderer.cs
index 37534607f..371435759 100644
--- a/Assets/Scripts/Sector Display/SectorRenderer.cs	
+++ b/Assets/Scripts/Sector Display/SectorRenderer.cs	
@@ -18,6 +18,7 @@ public class SectorRenderer : MonoBehaviour
     public Transform SectorBrushes;
     public MeshRenderer SectorBoundaryBrush;
     public MeshRenderer MinimapGravityQuad;
+    public MeshRenderer MinimapTintQuad;
     public CinemachineVirtualCamera SceneCamera;
     public Camera[] FogCameras;
     public Camera[] MinimapCameras;
@@ -183,9 +184,9 @@ public class SectorRenderer : MonoBehaviour
                 {
                     planet = Instantiate(Sun, ZoneRoot);
                     var sun = (SunObject) planet;
-                    sunData.LightColor.Subscribe(c => sun.Light.color = c);
+                    sunData.LightColor.Subscribe(c => sun.Light.color = c.ToColor());
                     sunData.Mass.Subscribe(m => sun.Light.range = Settings.PlanetSettings.LightRadius.Evaluate(m));
-                    sunData.FogTintColor.Subscribe(c => sun.FogTint.material.SetColor("_Color", c));
+                    sunData.FogTintColor.Subscribe(c => sun.FogTint.material.SetColor("_Color", c.ToColor()));
                     sunData.Mass.Subscribe(m => sun.FogTint.transform.localScale = Settings.PlanetSettings.FogTintRadius.Evaluate(m) * Vector3.one);
                 }
                 else planet = Instantiate(GasGiant, ZoneRoot);
@@ -313,6 +314,7 @@ public class SectorRenderer : MonoBehaviour
         var gravPos = MinimapGravityQuad.transform.position;
         gravPos.y = -Settings.PlanetSettings.ZoneDepth - _maxDepth;
         MinimapGravityQuad.transform.position = gravPos;
+        MinimapTintQuad.transform.position = gravPos - Vector3.up*10;
     }
 }
 
diff --git a/Assets/Scripts/ServerShared/Agents/AgentBehavior.cs b/Assets/Scripts/ServerShared/Agents/AgentBehavior.cs
index 67489445c..3900b8108 100644
--- a/Assets/Scripts/ServerShared/Agents/AgentBehavior.cs
+++ b/Assets/Scripts/ServerShared/Agents/AgentBehavior.cs
@@ -18,10 +18,10 @@ public abstract class AgentBehavior
     protected float TurningInput(float2 deltaV) => clamp(-Entity.Direction.AngleDiff(deltaV) * ControllerData.TurningSensitivity, -1, 1);
 
     protected ControllerData ControllerData;
-    protected GameContext Context;
+    protected ItemManager Context;
     protected Entity Entity;
 
-    public AgentBehavior(GameContext context, Entity entity, ControllerData controllerData)
+    public AgentBehavior(ItemManager context, Entity entity, ControllerData controllerData)
     {
         Context = context;
         Entity = entity;
diff --git a/Assets/Scripts/ServerShared/Agents/Aim.cs b/Assets/Scripts/ServerShared/Agents/Aim.cs
index f3c7e177b..b9e0f01b1 100644
--- a/Assets/Scripts/ServerShared/Agents/Aim.cs
+++ b/Assets/Scripts/ServerShared/Agents/Aim.cs
@@ -12,7 +12,7 @@ public class Aim : AgentBehavior
     private Turning _turning;
     private VelocityLimit _velocityLimit;
 
-    public Aim(GameContext context, Entity entity, ControllerData controllerData) : base(context, entity, controllerData)
+    public Aim(ItemManager context, Entity entity, ControllerData controllerData) : base(context, entity, controllerData)
     {
         _velocityLimit = Entity.GetBehaviors<VelocityLimit>().FirstOrDefault();
         _thrust = Entity.GetBehavior<Thruster>();
diff --git a/Assets/Scripts/ServerShared/Agents/HaulingTask.cs b/Assets/Scripts/ServerShared/Agents/HaulingTask.cs
index 6bec0faf2..706730ef2 100644
--- a/Assets/Scripts/ServerShared/Agents/HaulingTask.cs
+++ b/Assets/Scripts/ServerShared/Agents/HaulingTask.cs
@@ -9,10 +9,10 @@ public class HaulingTask : AgentTask
     public override TaskType Type => TaskType.Haul;
     
     [JsonProperty("origin"), Key(4)]
-    public Guid Origin;
+    public Entity Origin;
     
     [JsonProperty("target"), Key(5)]
-    public Guid Target;
+    public Entity Target;
     
     [JsonProperty("itemType"), Key(6)]
     public Guid ItemType;
diff --git a/Assets/Scripts/ServerShared/Agents/Locomotion.cs b/Assets/Scripts/ServerShared/Agents/Locomotion.cs
index ff388e2bd..c257d6452 100644
--- a/Assets/Scripts/ServerShared/Agents/Locomotion.cs
+++ b/Assets/Scripts/ServerShared/Agents/Locomotion.cs
@@ -14,7 +14,7 @@ public class Locomotion : AgentBehavior
     private Turning _turning;
     private VelocityLimit _velocityLimit;
 
-    public Locomotion(GameContext context, Entity entity, ControllerData controllerData) : base(context, entity, controllerData)
+    public Locomotion(ItemManager context, Entity entity, ControllerData controllerData) : base(context, entity, controllerData)
     {
         _velocityLimit = Entity.GetBehaviors<VelocityLimit>().FirstOrDefault();
         _thrust = Entity.GetBehavior<Thruster>();
diff --git a/Assets/Scripts/ServerShared/Agents/StationTowing.cs b/Assets/Scripts/ServerShared/Agents/StationTowing.cs
index 99aba9264..381d9fe3b 100644
--- a/Assets/Scripts/ServerShared/Agents/StationTowing.cs
+++ b/Assets/Scripts/ServerShared/Agents/StationTowing.cs
@@ -12,7 +12,7 @@ public class StationTowing : AgentTask
     [IgnoreMember] public override TaskType Type => TaskType.Tow;
     
     [JsonProperty("station"), Key(4)]
-    public Guid Station;
+    public OrbitalEntity Station;
     
     [JsonProperty("orbitParent"), Key(5)]
     public Guid OrbitParent;
diff --git a/Assets/Scripts/ServerShared/Agents/VelocityMatch.cs b/Assets/Scripts/ServerShared/Agents/VelocityMatch.cs
index b61c673c3..bd3e87851 100644
--- a/Assets/Scripts/ServerShared/Agents/VelocityMatch.cs
+++ b/Assets/Scripts/ServerShared/Agents/VelocityMatch.cs
@@ -13,9 +13,9 @@ public class VelocityMatch : AgentBehavior
     private Turning _turning;
     private const float TargetThreshold = .1f;
 
-    private GameContext _context;
+    private ItemManager _context;
 
-    public VelocityMatch(GameContext context, Entity entity, ControllerData controllerData) : base(context, entity, controllerData)
+    public VelocityMatch(ItemManager context, Entity entity, ControllerData controllerData) : base(context, entity, controllerData)
     {
         _context = context;
         _thrust = Entity.GetBehavior<Thruster>();
diff --git a/Assets/Scripts/ServerShared/Agents/WanderTask.cs b/Assets/Scripts/ServerShared/Agents/WanderTask.cs
new file mode 100644
index 000000000..4fc61dd8e
--- /dev/null
+++ b/Assets/Scripts/ServerShared/Agents/WanderTask.cs
@@ -0,0 +1,5 @@
+
+public class WanderTask : AgentTask
+{
+    public override TaskType Type => TaskType.None;
+}
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Agents/WanderTask.cs.meta b/Assets/Scripts/ServerShared/Agents/WanderTask.cs.meta
new file mode 100644
index 000000000..eaf3e44c6
--- /dev/null
+++ b/Assets/Scripts/ServerShared/Agents/WanderTask.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2320c5e3a86f42eeacb133b6529bfe89
+timeCreated: 1607467429
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs b/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs
index 1bc499ac4..adaa3b9a4 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs
@@ -41,6 +41,11 @@ public interface IAlwaysUpdatedBehavior
     void AlwaysUpdate(float delta);
 }
 
+public interface IOrderedBehavior
+{
+    int Order { get; }
+}
+
 public interface IPersistentBehavior//<T> where T : IBehavior
 {
     PersistentBehaviorData Store();
@@ -52,12 +57,12 @@ public interface IPopulationAssignment
     int AssignedPopulation { get; set; }
 }
 
-public interface IController
+public interface IController<T> where T: AgentTask
 {
     bool Available { get; }
-    TaskType TaskType { get; }
+    //TaskType TaskType { get; }
     Zone Zone { get; }
-    void AssignTask(Guid task);
+    void AssignTask(T task);
 }
 
 [MessagePackObject,
@@ -106,5 +111,5 @@ public abstract class BehaviorData
     [InspectableField, JsonProperty("group"), Key(0)]
     public int Group;
     
-    public abstract IBehavior CreateInstance(GameContext context, Entity entity, Gear item);
+    public abstract IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item);
 }
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Behaviors/Controller.cs b/Assets/Scripts/ServerShared/Behaviors/Controller.cs
index 392cbabca..b384d65db 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Controller.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Controller.cs
@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using MessagePack;
 using Newtonsoft.Json;
+using UniRx;
 using Unity.Mathematics;
 using static Unity.Mathematics.math;
 using float2 = Unity.Mathematics.float2;
@@ -26,27 +27,28 @@ public abstract class ControllerData : BehaviorData
     public float TargetDistance = 10;
 }
 
-public abstract class ControllerBase : IBehavior, IController, IInitializableBehavior
+public abstract class ControllerBase<T> : IBehavior, IController<T>, IInitializableBehavior where T : AgentTask
 {
-    protected Guid HomeEntity => (_entity as Ship)?.HomeEntity ?? Guid.Empty;
-    public bool Available => _spaceworthy && Task == Guid.Empty;
-    public abstract TaskType TaskType { get; }
-    public Zone Zone => _entity.Zone;
+    protected Entity HomeEntity => (Entity as Ship)?.HomeEntity;
+    public bool Available => _spaceworthy && Task == null;
+    //public abstract TaskType TaskType { get; }
+    public Zone Zone => Entity.Zone;
     public BehaviorData Data => _controllerData;
     
+    protected ItemManager ItemManager { get; }
+    protected Entity Entity { get; }
+    
     protected Locomotion Locomotion;
     protected VelocityMatch VelocityMatch;
     protected Aim Aim;
     protected Func<float2> TargetPosition;
     protected Func<float2> TargetVelocity;
     protected bool MatchVelocity;
-    protected List<ZoneDefinition> Path;
-    protected Guid Task;
+    // protected List<ZoneDefinition> Path;
+    protected T Task;
     protected bool Moving;
     protected bool Waiting;
     
-    private GameContext _context;
-    private Entity _entity;
     private ControllerData _controllerData;
     private MovementPhase _movementPhase;
     private Action _onFinishMoving;
@@ -54,33 +56,36 @@ public abstract class ControllerBase : IBehavior, IController, IInitializableBeh
     private float _waitTime;
     private Action _onFinishWaiting;
 
-    public ControllerBase(GameContext context, ControllerData data, Entity entity)
+    public ControllerBase(ItemManager itemManager, ControllerData data, Entity entity)
     {
-        _context = context;
+        ItemManager = itemManager;
+        Entity = entity;
         _controllerData = data;
-        _entity = entity;
-        entity.GearEvent.OnChanged += () =>
-        {
-            _spaceworthy = entity.GetBehavior<Thruster>() != null && entity.GetBehavior<Reactor>() != null;
-            if(_spaceworthy)
-                CreateBehaviors();
-        };
+        CheckSpaceworthiness();
+        entity.EquippedItems.ObserveAdd().Subscribe(added => CheckSpaceworthiness());
+    }
+
+    private void CheckSpaceworthiness()
+    {
+        _spaceworthy = Entity.GetBehavior<Thruster>() != null && Entity.GetBehavior<Reactor>() != null;
+        if(_spaceworthy)
+            CreateBehaviors();
     }
 
     public void CreateBehaviors()
     {
-        Locomotion = new Locomotion(_context, _entity, _controllerData);
-        VelocityMatch = new VelocityMatch(_context, _entity, _controllerData);
-        Aim = new Aim(_context, _entity, _controllerData);
+        Locomotion = new Locomotion(ItemManager, Entity, _controllerData);
+        VelocityMatch = new VelocityMatch(ItemManager, Entity, _controllerData);
+        Aim = new Aim(ItemManager, Entity, _controllerData);
     }
     
     public void Initialize()
     {
         CreateBehaviors();
-        _context.CorporationControllers[_entity.Corporation].Add(this);
+        // _context.CorporationControllers[_entity.Corporation].Add(this);
     }
     
-    public void AssignTask(Guid task)
+    public void AssignTask(T task)
     {
         Task = task;
         Moving = false;
@@ -91,7 +96,7 @@ public abstract class ControllerBase : IBehavior, IController, IInitializableBeh
         if (Available)
         {
             // No task is assigned and we're at home, do nothing!
-            if (_entity.Parent == HomeEntity)
+            if (Entity.Parent == HomeEntity)
                 return false;
             
             // No task is assigned, but we're not home, go home!
@@ -115,11 +120,11 @@ public abstract class ControllerBase : IBehavior, IController, IInitializableBeh
 
         if (Moving)
         {
-            if(_entity.Parent!=Guid.Empty)
-                _entity.RemoveParent();
+            if(Entity.Parent!=null)
+                Entity.RemoveParent();
 
             var targetPosition = TargetPosition();
-            var distance = length(targetPosition - _entity.Position);
+            var distance = length(targetPosition - Entity.Position);
             if (MatchVelocity)
             {
                 var targetVelocity = TargetVelocity();
@@ -165,28 +170,24 @@ public abstract class ControllerBase : IBehavior, IController, IInitializableBeh
 
     public void FinishTask()
     {
-        if (Task == Guid.Empty)
+        if (Task == null)
             return;
         
-        var task = _context.Cache.Get(Task);
-        _context.Cache.Delete(task);
-        _context.Cache.Get<Corporation>(_entity.Corporation).Tasks.Remove(task.ID);
-        Task = Guid.Empty;
+        Task = null;
     }
 
     public void GoHome(Action onFinish = null)
     {
-        var homeEntity = _context.Cache.Get<Entity>(HomeEntity);
-        if (Zone == homeEntity.Zone) MoveTo(homeEntity, true, () =>
+        MoveTo(HomeEntity, true, () =>
         {
-            _entity.SetParent(homeEntity);
+            Entity.SetParent(HomeEntity);
             onFinish?.Invoke();
         });
-        else MoveTo(homeEntity.Zone.Data.ID, () => MoveTo(homeEntity, true, () =>
-        {
-            _entity.SetParent(homeEntity);
-            onFinish?.Invoke();
-        }));
+        // else MoveTo(homeEntity.Zone.Data.ID, () => MoveTo(homeEntity, true, () =>
+        // {
+        //     _entity.SetParent(homeEntity);
+        //     onFinish?.Invoke();
+        // }));
     }
 
     public void Wait(float time, Action onFinish = null)
@@ -226,25 +227,25 @@ public abstract class ControllerBase : IBehavior, IController, IInitializableBeh
         _onFinishMoving = onFinish;
     }
 
-    public void MoveTo(Guid zone, Action onFinish = null)
-    {
-        var path = _context.FindPath(_context.GalaxyZones[Zone.Data.ID], _context.GalaxyZones[zone]);
-
-        void OnNextZone()
-        {
-            path.RemoveAt(0);
-            if (path.Count > 0)
-            {
-                MoveTo(Zone.WormholePosition(Path[0]), false, OnNextZone);
-            }
-            else
-            {
-                onFinish?.Invoke();
-            }
-        }
-        
-        OnNextZone();
-    }
+    // public void MoveTo(Guid zone, Action onFinish = null)
+    // {
+    //     var path = _context.FindPath(_context.GalaxyZones[Zone.Data.ID], _context.GalaxyZones[zone]);
+    //
+    //     void OnNextZone()
+    //     {
+    //         path.RemoveAt(0);
+    //         if (path.Count > 0)
+    //         {
+    //             MoveTo(Zone.WormholePosition(Path[0]), false, OnNextZone);
+    //         }
+    //         else
+    //         {
+    //             onFinish?.Invoke();
+    //         }
+    //     }
+    //     
+    //     OnNextZone();
+    // }
 }
 
 public enum MovementPhase
diff --git a/Assets/Scripts/ServerShared/Behaviors/Cooldown.cs b/Assets/Scripts/ServerShared/Behaviors/Cooldown.cs
index 38fd45381..82554be66 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Cooldown.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Cooldown.cs
@@ -9,7 +9,7 @@ public class CooldownData : BehaviorData
     [InspectableField, JsonProperty("cooldown"), Key(1), RuntimeInspectable]
     public PerformanceStat Cooldown = new PerformanceStat();
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Cooldown(context, this, entity, item);
     }
@@ -18,16 +18,15 @@ public class CooldownData : BehaviorData
 public class Cooldown : IBehavior, IAlwaysUpdatedBehavior
 {
     private CooldownData _data;
+    public BehaviorData Data => _data;
 
     private Entity Entity { get; }
-    private Gear Item { get; }
-    private GameContext Context { get; }
-
-    public BehaviorData Data => _data;
+    private EquippedItem Item { get; }
+    private ItemManager Context { get; }
 
     private float _cooldown; // Normalized
 
-    public Cooldown(GameContext context, CooldownData data, Entity entity, Gear item)
+    public Cooldown(ItemManager context, CooldownData data, Entity entity, EquippedItem item)
     {
         _data = data;
         Entity = entity;
@@ -49,6 +48,6 @@ public class Cooldown : IBehavior, IAlwaysUpdatedBehavior
 
     public void AlwaysUpdate(float delta)
     {
-        _cooldown -= delta / Context.Evaluate(_data.Cooldown, Item, Entity);
+        _cooldown -= delta / Context.Evaluate(_data.Cooldown, Item.EquippableItem, Entity);
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Behaviors/EnergyDraw.cs b/Assets/Scripts/ServerShared/Behaviors/EnergyDraw.cs
index bf5f9b839..af30fbdb6 100644
--- a/Assets/Scripts/ServerShared/Behaviors/EnergyDraw.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/EnergyDraw.cs
@@ -12,23 +12,24 @@ public class EnergyDrawData : BehaviorData
     [InspectableField, JsonProperty("perSecond"), Key(2)]
     public bool PerSecond;
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new EnergyDraw(context, this, entity, item);
     }
 }
 
-public class EnergyDraw : IBehavior
+public class EnergyDraw : IBehavior, IOrderedBehavior
 {
     private EnergyDrawData _data;
 
+    public int Order => -100;
     private Entity Entity { get; }
-    private Gear Item { get; }
-    private GameContext Context { get; }
+    private EquippedItem Item { get; }
+    private ItemManager Context { get; }
 
     public BehaviorData Data => _data;
 
-    public EnergyDraw(GameContext context, EnergyDrawData data, Entity entity, Gear item)
+    public EnergyDraw(ItemManager context, EnergyDrawData data, Entity entity, EquippedItem item)
     {
         _data = data;
         Entity = entity;
@@ -38,7 +39,7 @@ public class EnergyDraw : IBehavior
 
     public bool Update(float delta)
     {
-        Entity.Energy -= Context.Evaluate(_data.Draw, Item, Entity) * (_data.PerSecond ? delta : 1);
+        Entity.Energy -= Context.Evaluate(_data.Draw, Item.EquippableItem, Entity) * (_data.PerSecond ? delta : 1);
         return true;
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Behaviors/FactoryBehavior.cs b/Assets/Scripts/ServerShared/Behaviors/FactoryBehavior.cs
index 426e46084..a4ce96464 100644
--- a/Assets/Scripts/ServerShared/Behaviors/FactoryBehavior.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/FactoryBehavior.cs
@@ -22,13 +22,13 @@ public class FactoryData : BehaviorData
     [InspectableDatabaseLink(typeof(PersonalityAttribute)), JsonProperty("productionProfile"), Key(4)]  
     public Dictionary<Guid, float> ProductionProfile = new Dictionary<Guid, float>();
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Factory(context, this, entity, item);
     }
 }
 
-public class Factory : IBehavior, IPersistentBehavior, IPopulationAssignment
+public class Factory : IBehavior//, IPersistentBehavior, IPopulationAssignment
 {
     public float ProductionQuality;
     public double RetoolingTime;
@@ -38,8 +38,8 @@ public class Factory : IBehavior, IPersistentBehavior, IPopulationAssignment
     public int AssignedPopulation { get; set; }
     
     public Entity Entity { get; }
-    public Gear Item { get; }
-    public GameContext Context { get; }
+    public EquippedItem Item { get; }
+    public ItemManager Context { get; }
 
     public BehaviorData Data => _data;
     
@@ -56,11 +56,10 @@ public class Factory : IBehavior, IPersistentBehavior, IPopulationAssignment
                 Active = false;
                 if(value != Guid.Empty)
                 {
-                    ItemName = Context.Cache.Get<ItemData>(Context.Cache.Get<BlueprintData>(value).Item).Name;
+                    ItemName = Context.ItemData.Get<ItemData>(Context.ItemData.Get<BlueprintData>(value).Item).Name;
                     RetoolingTime = ToolingTime;
                     _retooling = true;
                 }
-                Item.Change();
             }
         }
     }
@@ -71,102 +70,207 @@ public class Factory : IBehavior, IPersistentBehavior, IPopulationAssignment
     private bool _retooling = false;
     private float _currentProductionQuality;
 
-    public Factory(GameContext context, FactoryData data, Entity entity, Gear item)
+    public Factory(ItemManager context, FactoryData data, Entity entity, EquippedItem item)
     {
         Context = context;
         _data = data;
         Entity = entity;
         Item = item;
     }
-
+    
     public bool Update(float delta)
     {
-        ToolingTime = Context.Evaluate(_data.ToolingTime, Item, Entity);
-        var blueprint = Context.Cache.Get<BlueprintData>(_blueprint);
-        if (blueprint == null)
-            return false;
-
-        if (ItemUnderConstruction != Guid.Empty)
-        {
-            Entity.IncompleteCargo[ItemUnderConstruction] =
-                Entity.IncompleteCargo[ItemUnderConstruction] - delta * (AssignedPopulation + _data.AutomationPoints) /
-                pow(lerp(blueprint.QualityFloor, 1, saturate(_currentProductionQuality)),
-                    blueprint.ProductionExponent);
-            
-            if(Entity.IncompleteCargo[ItemUnderConstruction] < 0)
-            {
-                var item = Context.Cache.Get<ItemInstance>(ItemUnderConstruction);
-                if (item is SimpleCommodity simpleCommodity)
-                    Entity.AddCargo(simpleCommodity);
-                else if (item is CraftedItemInstance craftedItemInstance)
-                    Entity.AddCargo(craftedItemInstance);
-                Entity.IncompleteCargo.Remove(ItemUnderConstruction);
-                ItemUnderConstruction = Guid.Empty;
-                foreach (var attribute in _data.ProductionProfile)
-                    Entity.Personality[attribute.Key] = lerp(Entity.Personality[attribute.Key], attribute.Value,
-                        Context.GlobalData.ProductionPersonalityLerp * ((float) AssignedPopulation / Entity.Population));
-                Item.Change();
-            }
-
-            return true;
-        }
-        
-        if (RetoolingTime > 0)
-        {
-            RetoolingTime -= delta;
-            return false;
-        }
-
-        if (_retooling)
-        {
-            _retooling = false;
-            Item.Change();
-        }
-
-        if (Active)
-        {
-            var profileDistance = 0f;
-            if (_data.ProductionProfile.Any())
-                profileDistance = _data.ProductionProfile.Sum(x => abs(x.Value - Entity.Personality[x.Key])) /
-                                  _data.ProductionProfile.Count;
-            var personalityQuality = 
-                (_data.AutomationPoints * _data.AutomationQuality + AssignedPopulation * (1 - profileDistance)) / 
-                (_data.AutomationPoints + AssignedPopulation);
-            ItemUnderConstruction = Entity.Build(blueprint, 
-                blueprint.Quality *
-                pow(personalityQuality, blueprint.PersonalityExponent) *
-                pow(ProductionQuality, blueprint.QualityExponent) *
-                // Applying exponents to two random numbers and averaging them produces a range of interesting probability distributions for quality
-                (pow(Context.Random.NextFloat(), blueprint.RandomQualityExponent) +
-                 pow(Context.Random.NextFloat(), blueprint.RandomQualityExponent)) / 2, ItemName);
-        
-            if(ItemUnderConstruction!=Guid.Empty)
-                Item.Change();
-        }
-        
+    //     ToolingTime = Context.Evaluate(_data.ToolingTime, Item, Entity);
+    //     var blueprint = Context.ItemData.Get<BlueprintData>(_blueprint);
+    //     if (blueprint == null)
+    //         return false;
+    //
+    //     if (ItemUnderConstruction != Guid.Empty)
+    //     {
+    //         Entity.IncompleteCargo[ItemUnderConstruction] =
+    //             Entity.IncompleteCargo[ItemUnderConstruction] - delta * (AssignedPopulation + _data.AutomationPoints) /
+    //             pow(lerp(blueprint.QualityFloor, 1, saturate(_currentProductionQuality)),
+    //                 blueprint.ProductionExponent);
+    //         
+    //         if(Entity.IncompleteCargo[ItemUnderConstruction] < 0)
+    //         {
+    //             var item = Context.ItemData.Get<ItemInstance>(ItemUnderConstruction);
+    //             if (item is SimpleCommodity simpleCommodity)
+    //                 Entity.AddCargo(simpleCommodity);
+    //             else if (item is CraftedItemInstance craftedItemInstance)
+    //                 Entity.AddCargo(craftedItemInstance);
+    //             Entity.IncompleteCargo.Remove(ItemUnderConstruction);
+    //             ItemUnderConstruction = Guid.Empty;
+    //             foreach (var attribute in _data.ProductionProfile)
+    //                 Entity.Personality[attribute.Key] = lerp(Entity.Personality[attribute.Key], attribute.Value,
+    //                     Context.GameplaySettings.ProductionPersonalityLerp * ((float) AssignedPopulation / Entity.Population));
+    //         }
+    //
+    //         return true;
+    //     }
+    //     
+    //     if (RetoolingTime > 0)
+    //     {
+    //         RetoolingTime -= delta;
+    //         return false;
+    //     }
+    //
+    //     if (_retooling)
+    //     {
+    //         _retooling = false;
+    //     }
+    //
+    //     if (Active)
+    //     {
+    //         var profileDistance = 0f;
+    //         if (_data.ProductionProfile.Any())
+    //             profileDistance = _data.ProductionProfile.Sum(x => abs(x.Value - Entity.Personality[x.Key])) /
+    //                               _data.ProductionProfile.Count;
+    //         var personalityQuality = 
+    //             (_data.AutomationPoints * _data.AutomationQuality + AssignedPopulation * (1 - profileDistance)) / 
+    //             (_data.AutomationPoints + AssignedPopulation);
+    //         ItemUnderConstruction = Entity.Build(blueprint, 
+    //             blueprint.Quality *
+    //             pow(personalityQuality, blueprint.PersonalityExponent) *
+    //             pow(ProductionQuality, blueprint.QualityExponent) *
+    //             // Applying exponents to two random numbers and averaging them produces a range of interesting probability distributions for quality
+    //             (pow(Context.Random.NextFloat(), blueprint.RandomQualityExponent) +
+    //              pow(Context.Random.NextFloat(), blueprint.RandomQualityExponent)) / 2, ItemName);
+    //     }
+    //     
         return false;
     }
-
-    // TODO Update Factory Persistence
-    public PersistentBehaviorData Store()
-    {
-        return new FactoryPersistence
-        {
-            Blueprint = _blueprint,
-            RetoolingTime = RetoolingTime,
-            AssignedPopulation = AssignedPopulation,
-            ProductionQuality = ProductionQuality
-        };
-    }
-
-    public void Restore(PersistentBehaviorData data)
-    {
-        var factoryPersistence = data as FactoryPersistence;
-        _blueprint = factoryPersistence.Blueprint;
-        RetoolingTime = factoryPersistence.RetoolingTime;
-        AssignedPopulation = factoryPersistence.AssignedPopulation;
-        ProductionQuality = factoryPersistence.ProductionQuality;
-    }
+    //
+    // // TODO Update Factory Persistence
+    // public PersistentBehaviorData Store()
+    // {
+    //     return new FactoryPersistence
+    //     {
+    //         Blueprint = _blueprint,
+    //         RetoolingTime = RetoolingTime,
+    //         AssignedPopulation = AssignedPopulation,
+    //         ProductionQuality = ProductionQuality
+    //     };
+    // }
+    //
+    // public void Restore(PersistentBehaviorData data)
+    // {
+    //     var factoryPersistence = data as FactoryPersistence;
+    //     _blueprint = factoryPersistence.Blueprint;
+    //     RetoolingTime = factoryPersistence.RetoolingTime;
+    //     AssignedPopulation = factoryPersistence.AssignedPopulation;
+    //     ProductionQuality = factoryPersistence.ProductionQuality;
+    // }
+    //
+    // public Guid Build(BlueprintData blueprint, float quality, string name, bool direct = false)
+    // {
+    //     if (direct)
+    //     {
+    //         if(blueprint.FactoryItem!=Guid.Empty)
+    //             throw new ArgumentException("Attempted to directly build a blueprint which requires a factory!");
+    //         var blueprintItem = Context.Cache.Get<GearData>(blueprint.Item);
+    //         if(blueprintItem == null)
+    //             throw new ArgumentException("Attempted to directly build a blueprint for a missing or incompatible item!");
+    //     }
+    //
+    //     //var newItemID = Guid.Empty;
+    //
+    //     // GetBlueprintIngredients will assign the output lists with the items matching the blueprint, and return false if they are not found
+    //     if (!GetBlueprintIngredients(blueprint, out var simpleIngredients, out var compoundIngredients))
+    //         return Guid.Empty;
+    //     
+    //     // These will be bundled with the data for the compound commodity instance
+    //     var ingredients = new List<ItemInstance>();
+    //     ingredients.AddRange(compoundIngredients.Select(RemoveCargo));
+    //     ingredients.AddRange(simpleIngredients.Select(sc => RemoveCargo(sc, blueprint.Ingredients[sc.Data])));
+    //         
+    //     var blueprintItemData = Context.Cache.Get(blueprint.Item);
+    //     
+    //     // Creating new crafted item instances is a bit more complicated
+    //     if (blueprintItemData is CraftedItemData)
+    //     {
+    //         CraftedItemInstance newItem;
+    //         
+    //         if (blueprintItemData is EquippableItemData equippableItemData)
+    //         {
+    //             var newGear = new EquippableItem
+    //             {
+    //                 Context = Context,
+    //                 Data = blueprintItemData.ID,
+    //                 Ingredients = ingredients.Select(ii=>ii.ID).ToList(),
+    //                 Quality = quality,
+    //                 Blueprint = blueprint.ID,
+    //                 Name = name,
+    //                 SourceEntity = ID
+    //             };
+    //             newGear.Durability = Context.Evaluate(equippableItemData.Durability, newGear);
+    //             newItem = newGear;
+    //         }
+    //         else
+    //         {
+    //             newItem = new CompoundCommodity
+    //             {
+    //                 Context = Context,
+    //                 Data = blueprintItemData.ID,
+    //                 Ingredients = ingredients.Select(ii=>ii.ID).ToList(),
+    //                 Quality = quality,
+    //                 Blueprint = blueprint.ID,
+    //                 Name = name,
+    //                 SourceEntity = ID
+    //             };
+    //         }
+    //         Context.Cache.Add(newItem);
+    //         if (direct)
+    //             IncompleteGear[newItem.ID] = blueprint.ProductionTime;
+    //         else 
+    //             IncompleteCargo[newItem.ID] = blueprint.ProductionTime;
+    //         return newItem.ID;
+    //     }
+    //
+    //     var newSimpleCommodity = new SimpleCommodity
+    //     {
+    //         Context = Context,
+    //         Data = blueprintItemData.ID,
+    //         Quantity = 1
+    //     };
+    //     Context.Cache.Add(newSimpleCommodity);
+    //     IncompleteCargo[newSimpleCommodity.ID] = blueprint.ProductionTime;
+    //     return newSimpleCommodity.ID;
+    // }
+    //
+    // public bool GetBlueprintIngredients(BlueprintData blueprint, out List<SimpleCommodity> simpleIngredients,
+    //     out List<CompoundCommodity> compoundIngredients)
+    // {
+    //     simpleIngredients = new List<SimpleCommodity>();
+    //     compoundIngredients = new List<CompoundCommodity>();
+    //     var hasAllIngredients = true;
+    //     var cargoInstances = Cargo.Select(c => Context.Cache.Get<ItemInstance>(c));
+    //     foreach (var kvp in blueprint.Ingredients)
+    //     {
+    //         var itemData = Context.Cache.Get(kvp.Key);
+    //         if (itemData is SimpleCommodityData)
+    //         {
+    //             var matchingItem = cargoInstances.FirstOrDefault(ii =>
+    //             {
+    //                 if (!(ii is SimpleCommodity simpleCommodity)) return false;
+    //                 return simpleCommodity.Data == itemData.ID && simpleCommodity.Quantity >= kvp.Value;
+    //             }) as SimpleCommodity;
+    //             hasAllIngredients = hasAllIngredients && matchingItem != null;
+    //             if(matchingItem != null)
+    //                 simpleIngredients.Add(matchingItem);
+    //         }
+    //         else
+    //         {
+    //             var matchingItems =
+    //                 cargoInstances.Where(ii => (ii as CompoundCommodity)?.Data == itemData.ID).Cast<CompoundCommodity>().ToArray();
+    //             hasAllIngredients = hasAllIngredients && matchingItems.Length >= kvp.Value;
+    //             if(matchingItems.Length >= kvp.Value)
+    //                 compoundIngredients.AddRange(matchingItems.Take(kvp.Value));
+    //         }
+    //     }
+    //
+    //     return hasAllIngredients;
+    // }
 }
 
 [MessagePackObject, JsonObject(MemberSerialization.OptIn)]
diff --git a/Assets/Scripts/ServerShared/Behaviors/HaulingController.cs b/Assets/Scripts/ServerShared/Behaviors/HaulingController.cs
index 977b193f4..0b8ea5b69 100644
--- a/Assets/Scripts/ServerShared/Behaviors/HaulingController.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/HaulingController.cs
@@ -12,136 +12,121 @@ public class HaulingControllerData : ControllerData
 {
     [InspectableField, JsonProperty("targetDistance"), Key(6)]  
     public float DockTime = 2;
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new HaulingController(context, this, entity, item);
     }
 }
 
-public class HaulingController : ControllerBase, IBehavior, IPersistentBehavior
+public class HaulingController : ControllerBase<HaulingTask>, IBehavior, IPersistentBehavior
 {
-    public override TaskType TaskType => TaskType.Haul;
     public BehaviorData Data => _data;
-    
     private HaulingControllerData _data;
-    private GameContext _context;
-    private Entity _entity;
-    private Gear _item;
+    
+    private ItemManager ItemManager { get; }
+    private Entity Entity { get; }
+    private EquippedItem Item { get; }
+    
     private bool _taskStarted;
     private int _itemsDelivered;
+    private int _itemsCarried;
     private SimpleCommodity _simpleCommodityDelivery;
     private List<CraftedItemInstance> _craftedItemDelivery = new List<CraftedItemInstance>();
     
-    public HaulingController(GameContext context, HaulingControllerData data, Entity entity, Gear item) : base(context, data, entity)
+    public HaulingController(ItemManager itemManager, HaulingControllerData data, Entity entity, EquippedItem item) : base(itemManager, data, entity)
     {
-        _context = context;
+        ItemManager = itemManager;
         _data = data;
-        _entity = entity;
-        _item = item;
+        Entity = entity;
+        Item = item;
     }
 
     public new bool Update(float delta)
     {
-        var haulingTask = _context.Cache.Get<HaulingTask>(Task);
-        if (haulingTask != null)
+        if (Task != null)
         {
             if (!_taskStarted)
             {
-                MoveTo(haulingTask.Zone, OnOriginZoneArrival);
+                MoveTo(Task.Origin, true, OnPickup);
+                //MoveTo(haulingTask.Zone, OnOriginZoneArrival);
                 _taskStarted = true;
             }
         }
         return base.Update(delta);
     }
     
-    void OnOriginZoneArrival()
-    {
-        var haulingTask = _context.Cache.Get<HaulingTask>(Task);
-        
-        _entity.SetMessage("Entering pickup phase.");
-        
-        MoveTo(_context.Cache.Get<Entity>(haulingTask.Origin), true, OnPickup);
-    }
+    // void OnOriginZoneArrival()
+    // {
+    //     var haulingTask = _context.ItemData.Get<HaulingTask>(Task);
+    //     
+    //     _entity.SetMessage("Entering pickup phase.");
+    //     
+    //     MoveTo(_context.ItemData.Get<Entity>(haulingTask.Origin), true, OnPickup);
+    // }
     
     void OnPickup()
     {
-        var haulingTask = _context.Cache.Get<HaulingTask>(Task);
-        var target = Zone.Entities[haulingTask.Origin] as OrbitalEntity;
+        Entity.SetParent(Task.Origin);
+
+        _itemsCarried = Task.Origin.TryTransferItems(Entity, Task.ItemType, Task.Quantity - _itemsDelivered);
+
+        if (_itemsCarried == 0)
+        {
+            FinishTask();
+            return;
+        }
         
-        _entity.SetParent(target);
-        var itemData = _context.Cache.Get<ItemData>(haulingTask.ItemType);
-        int quantity = min((int) ((_entity.Capacity - _entity.OccupiedCapacity) / itemData.Size), haulingTask.Quantity - _itemsDelivered);
-        if (itemData is SimpleCommodityData)
-        {
-            var itemMatch = target.Cargo
-                .Select(id => _context.Cache.Get<SimpleCommodity>(id))
-                .FirstOrDefault(ii => ii != null && ii.Data == haulingTask.ItemType);
-            if(itemMatch==null)
-                FinishTask();
-            _simpleCommodityDelivery = _entity.AddCargo(target.RemoveCargo(itemMatch, quantity));
-        }
-        else if (itemData is CraftedItemData)
-        {
-            var itemMatches = target.Cargo
-                .Select(id => _context.Cache.Get<CraftedItemInstance>(id))
-                .Where(ii => ii != null && ii.Data == haulingTask.ItemType)
-                .ToArray();
-            if(!itemMatches.Any())
-                FinishTask();
-            foreach (var match in itemMatches)
-                _craftedItemDelivery.Add(_entity.AddCargo(target.RemoveCargo(match)));
-        }
         Wait(_data.DockTime, OnItemObtained);
     }
 
     void OnItemObtained()
     {
-        var haulingTask = _context.Cache.Get<HaulingTask>(Task);
-        _entity.SetMessage("Entering delivery phase.");
+        Entity.SetMessage("Entering delivery phase.");
 
-        var target = _context.Cache.Get<Entity>(haulingTask.Target);
-
-        MoveTo(target.Zone.Data.ID, OnTargetZoneArrival);
+        MoveTo(Task.Target, true, OnDelivery);
+        //MoveTo(target.Zone.Data.ID, OnTargetZoneArrival);
     }
     
-    void OnTargetZoneArrival()
-    {
-        var haulingTask = _context.Cache.Get<HaulingTask>(Task);
-        
-        MoveTo(_context.Cache.Get<Entity>(haulingTask.Target), true, OnDelivery);
-    }
+    // void OnTargetZoneArrival()
+    // {
+    //     var haulingTask = _context.ItemData.Get<HaulingTask>(Task);
+    //     
+    //     MoveTo(_context.ItemData.Get<Entity>(haulingTask.Target), true, OnDelivery);
+    // }
     
     void OnDelivery()
     {
-        var haulingTask = _context.Cache.Get<HaulingTask>(Task);
-        var target = Zone.Entities[haulingTask.Target] as OrbitalEntity;
-        
-        _entity.SetParent(target);
-        
-        var itemData = _context.Cache.Get<ItemData>(haulingTask.ItemType);
-        if (itemData is SimpleCommodityData)
-        {
-            target.AddCargo(_entity.RemoveCargo(_simpleCommodityDelivery, _simpleCommodityDelivery.Quantity));
-            _itemsDelivered += _simpleCommodityDelivery.Quantity;
-            _simpleCommodityDelivery = null;
-        }
-        else if (itemData is CraftedItemData)
-        {
-            foreach (var item in _craftedItemDelivery)
-                target.AddCargo(_entity.RemoveCargo(item));
-            _itemsDelivered += _craftedItemDelivery.Count;
-            _craftedItemDelivery.Clear();
-        }
-        
+        Entity.SetParent(Task.Target);
+
+        var itemsDelivered = Entity.TryTransferItems(Task.Target, Task.ItemType, _itemsCarried);
+        _itemsCarried -= itemsDelivered;
+        _itemsDelivered += itemsDelivered;
+
         Wait(_data.DockTime, () =>
         {
-            if(_itemsDelivered == haulingTask.Quantity)
+            // We were unable to transfer all onboard items to target entity, cargo is probably full. Bring back the surplus and end the mission
+            if(_itemsCarried > 0)
+                MoveTo(Task.Origin, true, ReturnSurplusToOrigin);
+            // We have delivered the target quantity of items, end the mission
+            else if(_itemsDelivered >= Task.Quantity)
                 FinishTask();
+            // We aren't done yet. Resetting the task will make us go for another delivery run
             else
                 _taskStarted = false;
         });
     }
 
+    void ReturnSurplusToOrigin()
+    {
+        Entity.SetParent(Task.Origin);
+
+        Entity.TryTransferItems(Task.Origin, Task.ItemType, _itemsCarried);
+        
+        Wait(_data.DockTime, OnItemObtained);
+        
+        FinishTask();
+    }
+
     public PersistentBehaviorData Store()
     {
         return new HaulingControllerPersistence
@@ -160,5 +145,5 @@ public class HaulingController : ControllerBase, IBehavior, IPersistentBehavior
 public class HaulingControllerPersistence : PersistentBehaviorData
 {
     [JsonProperty("task"), Key(0)]
-    public Guid Task;
+    public HaulingTask Task;
 }
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Behaviors/Heat.cs b/Assets/Scripts/ServerShared/Behaviors/Heat.cs
index 5341353c0..40ffd8cc8 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Heat.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Heat.cs
@@ -12,7 +12,7 @@ public class HeatData : BehaviorData
     [InspectableField, JsonProperty("perSecond"), Key(2)]
     public bool PerSecond;
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Heat(context, this, entity, item);
     }
@@ -23,12 +23,12 @@ public class Heat : IBehavior
     private HeatData _data;
 
     private Entity Entity { get; }
-    private Gear Item { get; }
-    private GameContext Context { get; }
+    private EquippedItem Item { get; }
+    private ItemManager Context { get; }
 
     public BehaviorData Data => _data;
 
-    public Heat(GameContext context, HeatData data, Entity entity, Gear item)
+    public Heat(ItemManager context, HeatData data, Entity entity, EquippedItem item)
     {
         _data = data;
         Entity = entity;
@@ -38,7 +38,7 @@ public class Heat : IBehavior
 
     public bool Update(float delta)
     {
-        Entity.AddHeat(Context.Evaluate(_data.Heat, Item, Entity) * (_data.PerSecond ? delta : 1));
+        Item.Temperature += Context.Evaluate(_data.Heat, Item.EquippableItem, Entity) * (_data.PerSecond ? delta : 1) / Context.GetThermalMass(Item.EquippableItem);
         return true;
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Behaviors/Hitscan.cs b/Assets/Scripts/ServerShared/Behaviors/Hitscan.cs
index 3bc66fd25..8a95c7781 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Hitscan.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Hitscan.cs
@@ -7,7 +7,7 @@ public class HitscanData : WeaponData
     [InspectableField, JsonProperty("perSecond"), Key(6)]
     public bool PerSecond;
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Hitscan(context, this, entity, item);
     }
@@ -19,14 +19,14 @@ public class Hitscan : IBehavior
     private float _cooldown; // normalized
     private HitscanData _data;
     private Entity Entity { get; }
-    private Gear Item { get; }
-    private GameContext Context { get; }
+    private EquippedItem Item { get; }
+    private ItemManager Context { get; }
     private float _firingVisibility;
     
     public BehaviorData Data => _data;
     public float Range { get; private set; }
 
-    public Hitscan(GameContext context, HitscanData c, Entity entity, Gear item)
+    public Hitscan(ItemManager context, HitscanData c, Entity entity, EquippedItem item)
     {
         Context = context;
         _data = c;
@@ -37,7 +37,7 @@ public class Hitscan : IBehavior
     public bool Update(float delta)
     {
         // TODO: Implement hitscan weapons!
-        Range = Context.Evaluate(_data.Range, Item, Entity);
+        Range = Context.Evaluate(_data.Range, Item.EquippableItem, Entity);
         return true;
     }
 
diff --git a/Assets/Scripts/ServerShared/Behaviors/ItemUsage.cs b/Assets/Scripts/ServerShared/Behaviors/ItemUsage.cs
index 8757210bd..dea6a6733 100644
--- a/Assets/Scripts/ServerShared/Behaviors/ItemUsage.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/ItemUsage.cs
@@ -10,7 +10,7 @@ public class ItemUsageData : BehaviorData
     [InspectableDatabaseLink(typeof(SimpleCommodityData)), JsonProperty("item"), Key(1), RuntimeInspectable]  
     public Guid Item;
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new ItemUsage(context, this, entity, item);
     }
@@ -21,12 +21,12 @@ public class ItemUsage : IBehavior
     private ItemUsageData _data;
 
     private Entity Entity { get; }
-    private Gear Item { get; }
-    private GameContext Context { get; }
+    private EquippedItem Item { get; }
+    private ItemManager Context { get; }
 
     public BehaviorData Data => _data;
 
-    public ItemUsage(GameContext context, ItemUsageData data, Entity entity, Gear item)
+    public ItemUsage(ItemManager context, ItemUsageData data, Entity entity, EquippedItem item)
     {
         _data = data;
         Entity = entity;
@@ -36,19 +36,15 @@ public class ItemUsage : IBehavior
 
     public bool Update(float delta)
     {
-        var cargoInstances = Entity.Cargo.Select(c => Context.Cache.Get<ItemInstance>(c));
-        if (cargoInstances.FirstOrDefault(c => c.Data == _data.Item) is SimpleCommodity item)
-        {
-            if (item.Quantity > 1)
-                item.Quantity--;
-            else
-            {
-                Entity.Cargo.Remove(item.ID);
-                Context.Cache.Delete(item);
-            }
+        var cargo = Entity.FindItemInCargo(_data.Item);
+        if (cargo == null) return false;
 
-            return true;
-        }
-        return false;
+        var item = cargo.ItemsOfType[_data.Item][0];
+        if (item is SimpleCommodity simpleCommodity)
+            cargo.Remove(simpleCommodity, 1);
+        if (item is CraftedItemInstance craftedItemInstance)
+            cargo.Remove(craftedItemInstance);
+        
+        return true;
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Behaviors/Launcher.cs b/Assets/Scripts/ServerShared/Behaviors/Launcher.cs
index 84678aa12..25ddbd320 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Launcher.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Launcher.cs
@@ -37,7 +37,7 @@ public class LauncherData : WeaponData
     [InspectableField, JsonProperty("lockOnTime"), Key(15)]
     public PerformanceStat LockOnTime = new PerformanceStat();
 
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Launcher(context, this, entity, item);
     }
@@ -52,13 +52,13 @@ public class Launcher : IBehavior, IAlwaysUpdatedBehavior
     
     private LauncherData _data;
     private Entity Entity { get; }
-    private Gear Item { get; }
-    private GameContext Context { get; }
+    private EquippedItem Item { get; }
+    private ItemManager Context { get; }
     private float _firingVisibility;
     
     public BehaviorData Data => _data;
 
-    public Launcher(GameContext context, LauncherData m, Entity entity, Gear item)
+    public Launcher(ItemManager context, LauncherData m, Entity entity, EquippedItem item)
     {
         Context = context;
         _data  = m;
diff --git a/Assets/Scripts/ServerShared/Behaviors/MiningController.cs b/Assets/Scripts/ServerShared/Behaviors/MiningController.cs
index 0a6147105..7539e32d8 100644
--- a/Assets/Scripts/ServerShared/Behaviors/MiningController.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/MiningController.cs
@@ -10,117 +10,110 @@ using static Unity.Mathematics.math;
 [MessagePackObject, JsonObject(MemberSerialization.OptIn), EntityTypeRestriction(HullType.Ship), Order(-100)]
 public class MiningControllerData : ControllerData
 {
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new MiningController(context, this, entity, item);
     }
 }
 
-public class MiningController : ControllerBase, IBehavior, IPersistentBehavior, IInitializableBehavior
+public class MiningController : ControllerBase<Mining>, IBehavior, IPersistentBehavior, IInitializableBehavior
 {
-    public override TaskType TaskType => TaskType.Mine;
     public BehaviorData Data => _data;
     
     private MiningControllerData _data;
-    private GameContext _context;
-    private Entity _entity;
-    private Gear _item;
+    private EquippedItem Item { get; }
     private bool _taskStarted;
     private int _asteroid = -1;
     private MiningTool _miningTool;
     private Switch _toolSwitch;
     
-    public MiningController(GameContext context, MiningControllerData data, Entity entity, Gear item) : base(context, data, entity)
+    public MiningController(ItemManager itemManager, MiningControllerData data, Entity entity, EquippedItem item) : base(itemManager, data, entity)
     {
-        _context = context;
         _data = data;
-        _entity = entity;
-        _item = item;
+        Item = item;
     }
 
     public new void Initialize()
     {
-        _miningTool = _entity.GetBehavior<MiningTool>();
-        _toolSwitch = _entity.GetSwitch<MiningTool>();
+        _miningTool = Entity.GetBehavior<MiningTool>();
+        _toolSwitch = Entity.GetSwitch<MiningTool>();
         base.Initialize();
     }
 
     public new bool Update(float delta)
     {
-        var miningTask = _context.Cache.Get<Mining>(Task);
-        if (miningTask != null)
-        {
-            if (!_taskStarted)
-            {
-                NextAsteroid();
-                _taskStarted = true;
-            }
-            else
-            {
-                if (!Moving)
-                {
-                    if (_entity.OccupiedCapacity < _entity.Capacity - 1)
-                    {
-                        var asteroidTransform = Zone.GetAsteroidTransform(miningTask.Asteroids, _asteroid);
-                        if (length(_entity.Position - asteroidTransform.xy) - asteroidTransform.w > _miningTool.Range)
-                        {
-                            _entity.SetMessage("Moving to target asteroid.");
-                            MoveTo(() => Zone.GetAsteroidTransform(miningTask.Asteroids, _asteroid).xy, 
-                                () => Zone.GetAsteroidVelocity(miningTask.Asteroids, _asteroid));
-                            _toolSwitch.Activated = false;
-                        }
-                        else
-                        {
-                            if (Zone.AsteroidExists(miningTask.Asteroids, _asteroid))
-                            {
-                                _miningTool.AsteroidBelt = miningTask.Asteroids;
-                                _miningTool.Asteroid = _asteroid;
-                                _toolSwitch.Activated = true;
-                                Aim.Objective = Zone.GetAsteroidTransform(miningTask.Asteroids, _asteroid).xy;
-                                Aim.Update(delta);
-                            }
-                            else NextAsteroid();
-                        }
-                    }
-                    else
-                    {
-                        _entity.SetMessage("Out of cargo space. Returning home to offload cargo.");
-                        GoHome(OnArriveHome);
-                    }
-                }
-            }
-        }
+        // if (Task != null)
+        // {
+        //     if (!_taskStarted)
+        //     {
+        //         NextAsteroid();
+        //         _taskStarted = true;
+        //     }
+        //     else
+        //     {
+        //         if (!Moving)
+        //         {
+        //             if (_entity.OccupiedCapacity < _entity.Capacity - 1)
+        //             {
+        //                 var asteroidTransform = Zone.GetAsteroidTransform(Task.Asteroids, _asteroid);
+        //                 if (length(_entity.Position - asteroidTransform.xy) - asteroidTransform.w > _miningTool.Range)
+        //                 {
+        //                     _entity.SetMessage("Moving to target asteroid.");
+        //                     MoveTo(() => Zone.GetAsteroidTransform(Task.Asteroids, _asteroid).xy, 
+        //                         () => Zone.GetAsteroidVelocity(Task.Asteroids, _asteroid));
+        //                     _toolSwitch.Activated = false;
+        //                 }
+        //                 else
+        //                 {
+        //                     if (Zone.AsteroidExists(Task.Asteroids, _asteroid))
+        //                     {
+        //                         _miningTool.AsteroidBelt = Task.Asteroids;
+        //                         _miningTool.Asteroid = _asteroid;
+        //                         _toolSwitch.Activated = true;
+        //                         Aim.Objective = Zone.GetAsteroidTransform(Task.Asteroids, _asteroid).xy;
+        //                         Aim.Update(delta);
+        //                     }
+        //                     else NextAsteroid();
+        //                 }
+        //             }
+        //             else
+        //             {
+        //                 _entity.SetMessage("Out of cargo space. Returning home to offload cargo.");
+        //                 GoHome(OnArriveHome);
+        //             }
+        //         }
+        //     }
+        // }
         return base.Update(delta);
     }
 
-    private void OnArriveHome()
-    {
-        var homeEntity = _context.Cache.Get<Entity>(HomeEntity);
-        foreach (var item in _entity.Cargo
-            .Select(id => _context.Cache.Get<ItemInstance>(id))
-            .Where(item => item is SimpleCommodity)
-            .Cast<SimpleCommodity>()
-            .ToArray())
-        {
-            int quantity = min((int) ((homeEntity.Capacity - homeEntity.OccupiedCapacity) / item.ItemData.Size), item.Quantity);
-            var newItem = _entity.RemoveCargo(item, quantity);
-            homeEntity.AddCargo(newItem);
-            
-            if (quantity < item.Quantity)
-            {
-                homeEntity.SetMessage("Colony is out of cargo space. Closing Mining Task.");
-                FinishTask();
-                _taskStarted = false;
-                return;
-            }
-        }
-    }
+    // private void OnArriveHome()
+    // {
+    //     var homeEntity = _context.ItemData.Get<Entity>(HomeEntity);
+    //     foreach (var item in _entity.Cargo
+    //         .Select(id => _context.ItemData.Get<ItemInstance>(id))
+    //         .Where(item => item is SimpleCommodity)
+    //         .Cast<SimpleCommodity>()
+    //         .ToArray())
+    //     {
+    //         int quantity = min((int) ((homeEntity.Capacity - homeEntity.OccupiedCapacity) / _context.GetData(item).Size), item.Quantity);
+    //         var newItem = _entity.RemoveCargo(item, quantity);
+    //         homeEntity.AddCargo(newItem);
+    //         
+    //         if (quantity < item.Quantity)
+    //         {
+    //             homeEntity.SetMessage("Colony is out of cargo space. Closing Mining Task.");
+    //             FinishTask();
+    //             _taskStarted = false;
+    //             return;
+    //         }
+    //     }
+    // }
 
     private void NextAsteroid()
     {
-        var miningTask = _context.Cache.Get<Mining>(Task);
-        _asteroid = Zone.NearestAsteroid(miningTask.Asteroids, _entity.Position);
-        _entity.SetMessage("Selecting new asteroid.");
+        _asteroid = Zone.NearestAsteroid(Task.Asteroids, Entity.Position);
+        Entity.SetMessage("Selecting new asteroid.");
     }
 
     public PersistentBehaviorData Store()
@@ -141,5 +134,5 @@ public class MiningController : ControllerBase, IBehavior, IPersistentBehavior,
 public class MiningControllerPersistence : PersistentBehaviorData
 {
     [JsonProperty("task"), Key(0)]
-    public Guid Task;
+    public Mining Task;
 }
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Behaviors/MiningTool.cs b/Assets/Scripts/ServerShared/Behaviors/MiningTool.cs
index c5e2543ba..92f276f94 100644
--- a/Assets/Scripts/ServerShared/Behaviors/MiningTool.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/MiningTool.cs
@@ -20,7 +20,7 @@ public class MiningToolData : BehaviorData
     [InspectableField, JsonProperty("range"), Key(4)]
     public PerformanceStat Range = new PerformanceStat();
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new MiningTool(context, this, entity, item);
     }
@@ -34,13 +34,13 @@ public class MiningTool : IBehavior
     private MiningToolData _data;
 
     private Entity Entity { get; }
-    private Gear Item { get; }
-    private GameContext Context { get; }
+    private EquippedItem Item { get; }
+    private ItemManager Context { get; }
 
     public BehaviorData Data => _data;
     public float Range { get; private set; }
 
-    public MiningTool(GameContext context, MiningToolData data, Entity entity, Gear item)
+    public MiningTool(ItemManager context, MiningToolData data, Entity entity, EquippedItem item)
     {
         _data = data;
         Entity = entity;
@@ -50,7 +50,7 @@ public class MiningTool : IBehavior
 
     public bool Update(float delta)
     {
-        Range = Context.Evaluate(_data.Range, Item, Entity);
+        Range = Context.Evaluate(_data.Range, Item.EquippableItem, Entity);
         var asteroidTransform = Entity.Zone.GetAsteroidTransform(AsteroidBelt, Asteroid);
         if (AsteroidBelt != Guid.Empty && 
             Entity.Zone.AsteroidExists(AsteroidBelt, Asteroid) && 
@@ -60,9 +60,9 @@ public class MiningTool : IBehavior
                 Entity,
                 AsteroidBelt,
                 Asteroid,
-                Context.Evaluate(_data.DamagePerSecond, Item, Entity) * delta,
-                Context.Evaluate(_data.Efficiency, Item, Entity),
-                Context.Evaluate(_data.Penetration, Item, Entity));
+                Context.Evaluate(_data.DamagePerSecond, Item.EquippableItem, Entity) * delta,
+                Context.Evaluate(_data.Efficiency, Item.EquippableItem, Entity),
+                Context.Evaluate(_data.Penetration, Item.EquippableItem, Entity));
             return true;
         }
 
diff --git a/Assets/Scripts/ServerShared/Behaviors/PatrolController.cs b/Assets/Scripts/ServerShared/Behaviors/PatrolController.cs
index f3f230246..bcf441b5c 100644
--- a/Assets/Scripts/ServerShared/Behaviors/PatrolController.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/PatrolController.cs
@@ -10,58 +10,50 @@ using static Unity.Mathematics.math;
 [MessagePackObject, JsonObject(MemberSerialization.OptIn), EntityTypeRestriction(HullType.Ship), Order(-100)]
 public class PatrolControllerData : ControllerData
 {
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new PatrolController(context, this, entity, item);
     }
 }
 
-public class PatrolController : IBehavior, IController, IInitializableBehavior
+public class PatrolController : IBehavior, IInitializableBehavior
 {
-    public TaskType TaskType => TaskType.None;
-    public bool Available => false;
-    public Zone Zone => _entity.Zone;
     public BehaviorData Data => _data;
     
     private PatrolControllerData _data;
-    private GameContext _context;
-    private Entity _entity;
-    private Gear _item;
+    private ItemManager Context { get; }
+    private Entity Entity { get; }
+    private EquippedItem Item { get; }
     private Locomotion _locomotion;
     private Guid _targetOrbit;
     
-    public PatrolController(GameContext context, PatrolControllerData data, Entity entity, Gear item)
+    public PatrolController(ItemManager context, PatrolControllerData data, Entity entity, EquippedItem item)
     {
-        _context = context;
+        Context = context;
         _data = data;
-        _entity = entity;
-        _item = item;
+        Entity = entity;
+        Item = item;
     }
     
     public void Initialize()
     {
-        _locomotion = new Locomotion(_context, _entity, _data);
+        _locomotion = new Locomotion(Context, Entity, _data);
         RandomTarget();
     }
 
     public bool Update(float delta)
     {
-        _locomotion.Objective = Zone.GetOrbitPosition(_targetOrbit);
+        _locomotion.Objective = Entity.Zone.GetOrbitPosition(_targetOrbit);
         _locomotion.Update(delta);
         
-        if(length(_entity.Position - _locomotion.Objective) < _data.TargetDistance)
+        if(length(Entity.Position - _locomotion.Objective) < _data.TargetDistance)
             RandomTarget();
         
         return true;
     }
-
-    public void AssignTask(Guid task)
-    {
-        throw new NotImplementedException();
-    }
     
     private void RandomTarget()
     {
-        _targetOrbit = Zone.Planets.Keys.ToArray()[_context.Random.NextInt(Zone.Planets.Count)];
+        _targetOrbit = Entity.Zone.Planets.Keys.ToArray()[Context.Random.NextInt(Entity.Zone.Planets.Count)];
     }
 }
diff --git a/Assets/Scripts/ServerShared/Behaviors/ProjectileWeapon.cs b/Assets/Scripts/ServerShared/Behaviors/ProjectileWeapon.cs
index 611de449e..fa54a2e1e 100644
--- a/Assets/Scripts/ServerShared/Behaviors/ProjectileWeapon.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/ProjectileWeapon.cs
@@ -16,7 +16,7 @@ public class ProjectileWeaponData : WeaponData
     [InspectableField, JsonProperty("bulletVelocity"), Key(9)]  
     public PerformanceStat Velocity = new PerformanceStat();
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new ProjectileWeapon(context, this, entity, item);
     }
@@ -26,12 +26,12 @@ public class ProjectileWeapon : IBehavior
 {
     private ProjectileWeaponData _data;
     private Entity Entity { get; }
-    private Gear Item { get; }
-    private GameContext Context { get; }
+    private EquippedItem Item { get; }
+    private ItemManager Context { get; }
     
     public BehaviorData Data => _data;
 
-    public ProjectileWeapon(GameContext context, ProjectileWeaponData c, Entity entity, Gear item)
+    public ProjectileWeapon(ItemManager context, ProjectileWeaponData c, Entity entity, EquippedItem item)
     {
         Context = context;
         _data = c;
diff --git a/Assets/Scripts/ServerShared/Behaviors/Radiance.cs b/Assets/Scripts/ServerShared/Behaviors/Radiance.cs
index b5e3047b3..a0cc277f8 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Radiance.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Radiance.cs
@@ -9,7 +9,7 @@ public class RadianceData : BehaviorData
     [InspectableField, JsonProperty("radiance"), Key(1), RuntimeInspectable]
     public PerformanceStat Radiance = new PerformanceStat();
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Radiance(context, this, entity, item);
     }
@@ -20,12 +20,12 @@ public class Radiance : IBehavior
     private RadianceData _data;
 
     private Entity Entity { get; }
-    private Gear Item { get; }
-    private GameContext Context { get; }
+    private EquippedItem Item { get; }
+    private ItemManager Context { get; }
 
     public BehaviorData Data => _data;
 
-    public Radiance(GameContext context, RadianceData data, Entity entity, Gear item)
+    public Radiance(ItemManager context, RadianceData data, Entity entity, EquippedItem item)
     {
         _data = data;
         Entity = entity;
diff --git a/Assets/Scripts/ServerShared/Behaviors/Radiator.cs b/Assets/Scripts/ServerShared/Behaviors/Radiator.cs
index 13ac64665..2c729eb93 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Radiator.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Radiator.cs
@@ -9,7 +9,7 @@ public class RadiatorData : BehaviorData
     [InspectableField, JsonProperty("emissivity"), Key(1), RuntimeInspectable]  
     public PerformanceStat Emissivity = new PerformanceStat();
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Radiator(context, this, entity, item);
     }
@@ -18,8 +18,8 @@ public class RadiatorData : BehaviorData
 public class Radiator : IBehavior
 {
     public Entity Entity { get; }
-    public Gear Item { get; }
-    public GameContext Context { get; }
+    public EquippedItem Item { get; }
+    public ItemManager Context { get; }
 
     public BehaviorData Data => _data;
 
@@ -27,7 +27,7 @@ public class Radiator : IBehavior
     
     private RadiatorData _data;
 
-    public Radiator(GameContext context, RadiatorData data, Entity entity, Gear item)
+    public Radiator(ItemManager context, RadiatorData data, Entity entity, EquippedItem item)
     {
         Context = context;
         _data = data;
@@ -37,9 +37,9 @@ public class Radiator : IBehavior
 
     public bool Update(float delta)
     {
-        Emissivity = Context.Evaluate(_data.Emissivity, Item, Entity);
-        var rad = pow(Entity.Temperature, Context.GlobalData.HeatRadiationPower) * Context.GlobalData.HeatRadiationMultiplier * Emissivity;
-        Entity.Temperature -= rad * delta;
+        Emissivity = Context.Evaluate(_data.Emissivity, Item.EquippableItem, Entity);
+        var rad = pow(Item.Temperature, Context.GameplaySettings.HeatRadiationExponent) * Context.GameplaySettings.HeatRadiationMultiplier * Emissivity;
+        Item.Temperature -= rad * delta;
         Entity.VisibilitySources[this] = rad;
         return true;
     }
diff --git a/Assets/Scripts/ServerShared/Behaviors/Reactor.cs b/Assets/Scripts/ServerShared/Behaviors/Reactor.cs
index de60f8e3b..26197f66c 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Reactor.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Reactor.cs
@@ -19,7 +19,7 @@ public class ReactorData : BehaviorData
     [InspectableField, JsonProperty("underload"), Key(5), RuntimeInspectable]  
     public PerformanceStat ThrottlingFactor = new PerformanceStat();
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Reactor(context, this, entity, item);
     }
@@ -30,13 +30,13 @@ public class Reactor : IBehavior
     private ReactorData _data;
 
     public Entity Entity { get; }
-    public Gear Item { get; }
-    public GameContext Context { get; }
+    public EquippedItem Item { get; }
+    public ItemManager Context { get; }
 
     public BehaviorData Data => _data;
     public float Capacitance;
 
-    public Reactor(GameContext context, ReactorData data, Entity entity, Gear item)
+    public Reactor(ItemManager context, ReactorData data, Entity entity, EquippedItem item)
     {
         Context = context;
         _data = data;
@@ -46,22 +46,22 @@ public class Reactor : IBehavior
 
     public bool Update(float delta)
     {
-        Capacitance = Context.Evaluate(_data.Capacitance, Item, Entity);
-        var charge = Context.Evaluate(_data.Charge, Item, Entity) * delta;
-        var efficiency = Context.Evaluate(_data.Efficiency, Item, Entity);
+        Capacitance = Context.Evaluate(_data.Capacitance, Item.EquippableItem, Entity);
+        var charge = Context.Evaluate(_data.Charge, Item.EquippableItem, Entity) * delta;
+        var efficiency = Context.Evaluate(_data.Efficiency, Item.EquippableItem, Entity);
 
-        Entity.AddHeat(charge / efficiency);
+        Item.Temperature += (charge / efficiency) / Context.GetThermalMass(Item.EquippableItem);
         Entity.Energy += charge;
 
         if (Entity.Energy > Capacitance)
         {
-            Entity.AddHeat(-(Entity.Energy - Capacitance) / efficiency * (1 - 1 / Context.Evaluate(_data.ThrottlingFactor, Item, Entity)));
+            Item.Temperature -= (Entity.Energy - Capacitance) / efficiency * (1 - 1 / Context.Evaluate(_data.ThrottlingFactor, Item.EquippableItem, Entity)) / Context.GetThermalMass(Item.EquippableItem);
             Entity.Energy = Capacitance;
         }
 
         if (Entity.Energy < 0)
         {
-            Entity.AddHeat( -Entity.Energy / Context.Evaluate(_data.OverloadEfficiency, Item, Entity));
+            Item.Temperature += -Entity.Energy / Context.Evaluate(_data.OverloadEfficiency, Item.EquippableItem, Entity) / Context.GetThermalMass(Item.EquippableItem);
             Entity.Energy = 0;
         }
         return true;
diff --git a/Assets/Scripts/ServerShared/Behaviors/Reflector.cs b/Assets/Scripts/ServerShared/Behaviors/Reflector.cs
index 0b4baffc2..78cd3efb5 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Reflector.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Reflector.cs
@@ -12,7 +12,7 @@ public class ReflectorData : BehaviorData
     // [InspectableAnimationCurve, JsonProperty("visibility"), Key(1)]  
     // public float4[] VisibilityCurve;
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Reflector(context, this, entity, item);
     }
@@ -21,14 +21,14 @@ public class ReflectorData : BehaviorData
 public class Reflector : IBehavior
 {
     public Entity Entity { get; }
-    public Gear Item { get; }
-    public GameContext Context { get; }
+    public EquippedItem Item { get; }
+    public ItemManager Context { get; }
 
     public BehaviorData Data => _data;
     
     private ReflectorData _data;
 
-    public Reflector(GameContext context, ReflectorData data, Entity entity, Gear item)
+    public Reflector(ItemManager context, ReflectorData data, Entity entity, EquippedItem item)
     {
         Context = context;
         _data = data;
diff --git a/Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs b/Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs
index e94840cba..2ef7eb72e 100644
--- a/Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs
@@ -17,7 +17,7 @@ public class ResourceScannerData : BehaviorData
     [InspectableField, JsonProperty("scanDuration"), Key(3), RuntimeInspectable]
     public PerformanceStat ScanDuration = new PerformanceStat();
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new ResourceScanner(context, this, entity, item);
     }
@@ -32,8 +32,8 @@ public class ResourceScanner : IBehavior, IAlwaysUpdatedBehavior
     private Guid _scanTarget;
 
     private Entity Entity { get; }
-    private Gear Item { get; }
-    private GameContext Context { get; }
+    private EquippedItem Item { get; }
+    private ItemManager Context { get; }
 
     public BehaviorData Data => _data;
     public float Range { get; private set; }
@@ -53,7 +53,7 @@ public class ResourceScanner : IBehavior, IAlwaysUpdatedBehavior
         }
     }
 
-    public ResourceScanner(GameContext context, ResourceScannerData data, Entity entity, Gear item)
+    public ResourceScanner(ItemManager context, ResourceScannerData data, Entity entity, EquippedItem item)
     {
         _data = data;
         Entity = entity;
@@ -63,7 +63,7 @@ public class ResourceScanner : IBehavior, IAlwaysUpdatedBehavior
 
     public bool Update(float delta)
     {
-        var planetData = Context.Cache.Get<BodyData>(ScanTarget);
+        var planetData = Context.ItemData.Get<BodyData>(ScanTarget);
         if (planetData != null)
         {
             if (planetData is AsteroidBeltData beltData)
@@ -75,7 +75,8 @@ public class ResourceScanner : IBehavior, IAlwaysUpdatedBehavior
                     _scanTime += delta;
                     if (_scanTime > ScanDuration)
                     {
-                        Context.Cache.Get<Corporation>(Entity.Corporation).PlanetSurveyFloor[ScanTarget] = MinimumDensity;
+                        // TODO: Implement Scanning!
+                        //Context.ItemData.Get<Corporation>(Entity.Corporation).PlanetSurveyFloor[ScanTarget] = MinimumDensity;
                         _scanTime = 0;
                     }
                     return true;
@@ -88,7 +89,7 @@ public class ResourceScanner : IBehavior, IAlwaysUpdatedBehavior
                     _scanTime += delta;
                     if (_scanTime > ScanDuration)
                     {
-                        Context.Cache.Get<Corporation>(Entity.Corporation).PlanetSurveyFloor[ScanTarget] = MinimumDensity;
+                        //Context.ItemData.Get<Corporation>(Entity.Corporation).PlanetSurveyFloor[ScanTarget] = MinimumDensity;
                         _scanTime = 0;
                     }
                     return true;
@@ -100,8 +101,8 @@ public class ResourceScanner : IBehavior, IAlwaysUpdatedBehavior
 
     public void AlwaysUpdate(float delta)
     {
-        Range = Context.Evaluate(_data.Range, Item, Entity);
-        MinimumDensity = Context.Evaluate(_data.MinimumDensity, Item, Entity);
-        ScanDuration = Context.Evaluate(_data.ScanDuration, Item, Entity);
+        Range = Context.Evaluate(_data.Range, Item.EquippableItem, Entity);
+        MinimumDensity = Context.Evaluate(_data.MinimumDensity, Item.EquippableItem, Entity);
+        ScanDuration = Context.Evaluate(_data.ScanDuration, Item.EquippableItem, Entity);
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Behaviors/Sensor.cs b/Assets/Scripts/ServerShared/Behaviors/Sensor.cs
index 108ad5a06..c6d2a0da1 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Sensor.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Sensor.cs
@@ -8,7 +8,7 @@ public class SensorData : BehaviorData
     [InspectableField, JsonProperty("sensitivity"), Key(3), RuntimeInspectable]  
     public PerformanceStat Sensitivity = new PerformanceStat();
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Sensor(context, this, entity, item);
     }
@@ -19,12 +19,12 @@ public class Sensor : IBehavior
     private SensorData _data;
 
     private Entity Entity { get; }
-    private Gear Item { get; }
-    private GameContext Context { get; }
+    private EquippedItem Item { get; }
+    private ItemManager Context { get; }
 
     public BehaviorData Data => _data;
 
-    public Sensor(GameContext context, SensorData data, Entity entity, Gear item)
+    public Sensor(ItemManager context, SensorData data, Entity entity, EquippedItem item)
     {
         _data = data;
         Entity = entity;
diff --git a/Assets/Scripts/ServerShared/Behaviors/Shield.cs b/Assets/Scripts/ServerShared/Behaviors/Shield.cs
index 4e38eba95..8468e6241 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Shield.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Shield.cs
@@ -12,7 +12,7 @@ public class ShieldData : BehaviorData
     [InspectableField, JsonProperty("shielding"), Key(2), RuntimeInspectable]  
     public PerformanceStat Shielding = new PerformanceStat();
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Shield(context, this, entity, item);
     }
@@ -21,14 +21,14 @@ public class ShieldData : BehaviorData
 public class Shield : IBehavior
 {
     public Entity Entity { get; }
-    public Gear Item { get; }
-    public GameContext Context { get; }
+    public EquippedItem Item { get; }
+    public ItemManager Context { get; }
 
     public BehaviorData Data => _data;
     
     private ShieldData _data;
 
-    public Shield(GameContext context, ShieldData data, Entity entity, Gear item)
+    public Shield(ItemManager context, ShieldData data, Entity entity, EquippedItem item)
     {
         Context = context;
         _data = data;
diff --git a/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs b/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs
index 524304b52..c7503bb10 100644
--- a/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs
@@ -18,7 +18,7 @@ public class StatModifierData : BehaviorData
     [InspectableType(typeof(BehaviorData)), JsonProperty("requireBehavior"), Key(4)]
     public Type RequireBehavior;
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new StatModifier(context, this, entity, item);
     }
@@ -29,8 +29,8 @@ public class StatModifier : IBehavior, IInitializableBehavior, IDisposableBehavi
 {
     private StatModifierData _data;
     private Entity Entity { get; }
-    private Gear Item { get; }
-    private GameContext Context { get; }
+    private EquippedItem Item { get; }
+    private ItemManager Context { get; }
 
     public BehaviorData Data => _data;
 
@@ -38,10 +38,10 @@ public class StatModifier : IBehavior, IInitializableBehavior, IDisposableBehavi
     
     private static Type[] _statObjects;
 
-    private static Type[] StatObjects => _statObjects ?? (_statObjects = typeof(BehaviorData).GetAllChildClasses()
-        .Concat(typeof(EquippableItemData).GetAllChildClasses()).ToArray());
+    private static Type[] StatObjects => _statObjects = _statObjects ?? typeof(BehaviorData).GetAllChildClasses()
+        .Concat(typeof(EquippableItemData).GetAllChildClasses()).ToArray();
 
-    public StatModifier(GameContext context, StatModifierData data, Entity entity, Gear item)
+    public StatModifier(ItemManager context, StatModifierData data, Entity entity, EquippedItem item)
     {
         _data = data;
         Entity = entity;
@@ -59,19 +59,17 @@ public class StatModifier : IBehavior, IInitializableBehavior, IDisposableBehavi
             if (statField != null)
             {
                 if (typeof(EquippableItemData).IsAssignableFrom(targetType))
-                    _stats = Entity.Hardpoints
-                        .Select(hp => hp.Gear)
-                        .Where(gear => gear != null)
-                        .Where(gear => _data.RequireBehavior == null || gear.ItemData.Behaviors.Any(behavior => behavior.GetType() == _data.RequireBehavior))
-                        .Where(gear => gear.ItemData.GetType() == targetType)
-                        .Select(gear => statField.GetValue(gear.ItemData) as PerformanceStat)
+                    _stats = Entity.EquippedItems
+                        .Select(hp => hp.EquippableItem)
+                        .Where(gear => _data.RequireBehavior == null || Context.GetData(gear).Behaviors.Any(behavior => behavior.GetType() == _data.RequireBehavior))
+                        .Where(gear => Context.GetData(gear).GetType() == targetType)
+                        .Select(gear => statField.GetValue(Context.GetData(gear)) as PerformanceStat)
                         .ToArray();
                 else
-                    _stats = Entity.Hardpoints
-                        .Select(hp => hp.Gear)
-                        .Where(gear => gear != null)
-                        .Where(gear => _data.RequireBehavior == null || gear.ItemData.Behaviors.Any(behavior => behavior.GetType() == _data.RequireBehavior))
-                        .SelectMany(gear => gear.ItemData.Behaviors)
+                    _stats = Entity.EquippedItems
+                        .Select(hp => hp.EquippableItem)
+                        .Where(gear => _data.RequireBehavior == null || Context.GetData(gear).Behaviors.Any(behavior => behavior.GetType() == _data.RequireBehavior))
+                        .SelectMany(gear => Context.GetData(gear).Behaviors)
                         .Where(behaviorData => behaviorData.GetType() == targetType)
                         .Select(behaviorData => statField.GetValue(behaviorData) as PerformanceStat)
                         .ToArray();
@@ -84,7 +82,7 @@ public class StatModifier : IBehavior, IInitializableBehavior, IDisposableBehavi
         foreach (var stat in _stats)
             (_data.Type == StatModifierType.Constant
                 ? stat.GetConstantModifiers(Entity)
-                : stat.GetScaleModifiers(Entity))[this] = Context.Evaluate(_data.Modifier, Item, Entity);
+                : stat.GetScaleModifiers(Entity))[this] = Context.Evaluate(_data.Modifier, Item.EquippableItem, Entity);
         return true;
     }
 
diff --git a/Assets/Scripts/ServerShared/Behaviors/SurveyController.cs b/Assets/Scripts/ServerShared/Behaviors/SurveyController.cs
index 050d5aaf5..d510942b9 100644
--- a/Assets/Scripts/ServerShared/Behaviors/SurveyController.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/SurveyController.cs
@@ -11,109 +11,102 @@ using static Unity.Mathematics.math;
 [MessagePackObject, JsonObject(MemberSerialization.OptIn), EntityTypeRestriction(HullType.Ship), Order(-100)]
 public class SurveyControllerData : ControllerData
 {
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new SurveyController(context, this, entity, item);
     }
 }
 
-public class SurveyController : ControllerBase, IBehavior, IPersistentBehavior, IInitializableBehavior
+public class SurveyController : ControllerBase<Survey>, IBehavior, IPersistentBehavior, IInitializableBehavior
 {
-    public override TaskType TaskType => TaskType.Explore;
+    private EquippedItem Item { get; }
     public BehaviorData Data => _data;
     
     private SurveyControllerData _data;
-    private GameContext _context;
-    private Entity _entity;
-    private Gear _item;
     private bool _taskStarted;
     private ResourceScanner _scanningTool;
     private Switch _toolSwitch;
     private Guid _targetPlanet;
     private int _asteroid = -1;
     
-    public SurveyController(GameContext context, SurveyControllerData data, Entity entity, Gear item) : base(context, data, entity)
+    public SurveyController(ItemManager itemManager, SurveyControllerData data, Entity entity, EquippedItem item) : base(itemManager, data, entity)
     {
-        _context = context;
         _data = data;
-        _entity = entity;
-        _item = item;
+        Item = item;
     }
 
     public new void Initialize()
     {
-        _scanningTool = _entity.GetBehavior<ResourceScanner>();
-        _toolSwitch = _entity.GetSwitch<ResourceScanner>();
+        _scanningTool = Entity.GetBehavior<ResourceScanner>();
+        _toolSwitch = Entity.GetSwitch<ResourceScanner>();
         base.Initialize();
     }
 
     public new bool Update(float delta)
     {
-        var surveyTask = _context.Cache.Get<Survey>(Task);
-        var corporation = _context.Cache.Get<Corporation>(_entity.Corporation);
-        if (surveyTask != null)
-        {
-            if (!_taskStarted)
-            {
-                if (surveyTask.Planets.Any())
-                {
-                    _entity.SetMessage("Moving to survey target.");
-                    NextPlanet();
-                    _scanningTool.ScanTarget = _targetPlanet;
-                    _scanningTool.Asteroid = _asteroid;
-                    if (!corporation.PlanetSurveyFloor.ContainsKey(_targetPlanet) ||
-                        corporation.PlanetSurveyFloor[_targetPlanet] + .5f < _scanningTool.MinimumDensity)
-                    {
-                        var planetData = _context.Cache.Get<BodyData>(_targetPlanet);
-                        MoveTo(() =>
-                            {
-                                var target = GetPosition(planetData, _asteroid);
-                                var targetToUs = _entity.Position - target;
-                                return target + normalize(targetToUs) * _scanningTool.Range / 2;
-                            },
-                            () => GetVelocity(planetData, _asteroid), 
-                            () => _entity.SetMessage("Arrived at target. Scanning for resources."));
-                        _taskStarted = true;
-                    }
-                    else
-                        surveyTask.Planets.Remove(_targetPlanet);
-                }
-                else
-                {
-                    _entity.SetMessage("Survey complete. Returning Home.");
-                    FinishTask();
-                }
-            }
-            else
-            {
-                if (!Moving)
-                {
-                    var planetData = _context.Cache.Get<BodyData>(_targetPlanet);
-                    if ((!corporation.PlanetSurveyFloor.ContainsKey(_targetPlanet) ||
-                        corporation.PlanetSurveyFloor[_targetPlanet] + .5f < _scanningTool.MinimumDensity) &&
-                        length(_entity.Position - GetPosition(planetData, _asteroid)) < _scanningTool.Range)
-                    {
-                        _toolSwitch.Activated = true;
-                        Aim.Objective = GetPosition(planetData, _asteroid);
-                        Aim.Update(delta);
-                    }
-                    else
-                    {
-                        _toolSwitch.Activated = false;
-                        _taskStarted = false;
-                    }
-                }
-            }
-        }
+        // var corporation = _context.ItemData.Get<Corporation>(_entity.Corporation);
+        // if (surveyTask != null)
+        // {
+        //     if (!_taskStarted)
+        //     {
+        //         if (surveyTask.Planets.Any())
+        //         {
+        //             _entity.SetMessage("Moving to survey target.");
+        //             NextPlanet();
+        //             _scanningTool.ScanTarget = _targetPlanet;
+        //             _scanningTool.Asteroid = _asteroid;
+        //             if (!corporation.PlanetSurveyFloor.ContainsKey(_targetPlanet) ||
+        //                 corporation.PlanetSurveyFloor[_targetPlanet] + .5f < _scanningTool.MinimumDensity)
+        //             {
+        //                 var planetData = _context.ItemData.Get<BodyData>(_targetPlanet);
+        //                 MoveTo(() =>
+        //                     {
+        //                         var target = GetPosition(planetData, _asteroid);
+        //                         var targetToUs = _entity.Position - target;
+        //                         return target + normalize(targetToUs) * _scanningTool.Range / 2;
+        //                     },
+        //                     () => GetVelocity(planetData, _asteroid), 
+        //                     () => _entity.SetMessage("Arrived at target. Scanning for resources."));
+        //                 _taskStarted = true;
+        //             }
+        //             else
+        //                 surveyTask.Planets.Remove(_targetPlanet);
+        //         }
+        //         else
+        //         {
+        //             _entity.SetMessage("Survey complete. Returning Home.");
+        //             FinishTask();
+        //         }
+        //     }
+        //     else
+        //     {
+        //         if (!Moving)
+        //         {
+        //             var planetData = _context.ItemData.Get<BodyData>(_targetPlanet);
+        //             if ((!corporation.PlanetSurveyFloor.ContainsKey(_targetPlanet) ||
+        //                 corporation.PlanetSurveyFloor[_targetPlanet] + .5f < _scanningTool.MinimumDensity) &&
+        //                 length(_entity.Position - GetPosition(planetData, _asteroid)) < _scanningTool.Range)
+        //             {
+        //                 _toolSwitch.Activated = true;
+        //                 Aim.Objective = GetPosition(planetData, _asteroid);
+        //                 Aim.Update(delta);
+        //             }
+        //             else
+        //             {
+        //                 _toolSwitch.Activated = false;
+        //                 _taskStarted = false;
+        //             }
+        //         }
+        //     }
+        // }
         return base.Update(delta);
     }
 
     private void NextPlanet()
     {
-        var surveyTask = _context.Cache.Get<Survey>(Task);
-        var planets = surveyTask.Planets.Select(id => Zone.Planets[id]);
-        var nearestPlanet = planets.MinBy(p => lengthsq(_entity.Position - GetPosition(p)));
-        _asteroid = nearestPlanet is AsteroidBeltData ? Zone.NearestAsteroid(nearestPlanet.ID, _entity.Position) : -1;
+        var planets = Task.Planets.Select(id => Zone.Planets[id]);
+        var nearestPlanet = planets.MinBy(p => lengthsq(Entity.Position - GetPosition(p)));
+        _asteroid = nearestPlanet is AsteroidBeltData ? Zone.NearestAsteroid(nearestPlanet.ID, Entity.Position) : -1;
         _targetPlanet = nearestPlanet.ID;
     }
 
@@ -121,7 +114,7 @@ public class SurveyController : ControllerBase, IBehavior, IPersistentBehavior,
     {
         if (planet is AsteroidBeltData)
         {
-            if(asteroid == -1) asteroid = Zone.NearestAsteroid(planet.ID, _entity.Position);
+            if(asteroid == -1) asteroid = Zone.NearestAsteroid(planet.ID, Entity.Position);
             return Zone.GetAsteroidTransform(planet.ID, asteroid).xy;
         }
         return Zone.GetOrbitPosition(planet.Orbit);
@@ -131,7 +124,7 @@ public class SurveyController : ControllerBase, IBehavior, IPersistentBehavior,
     {
         if (planet is AsteroidBeltData)
         {
-            if(asteroid == -1) asteroid = Zone.NearestAsteroid(planet.ID, _entity.Position);
+            if(asteroid == -1) asteroid = Zone.NearestAsteroid(planet.ID, Entity.Position);
             return Zone.GetAsteroidVelocity(planet.ID, asteroid);
         }
         return Zone.GetOrbitVelocity(planet.Orbit);
@@ -155,5 +148,5 @@ public class SurveyController : ControllerBase, IBehavior, IPersistentBehavior,
 public class SurveyControllerPersistence : PersistentBehaviorData
 {
     [JsonProperty("task"), Key(0)]
-    public Guid Task;
+    public Survey Task;
 }
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Behaviors/Switch.cs b/Assets/Scripts/ServerShared/Behaviors/Switch.cs
index 88dee2a6a..b02b87a50 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Switch.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Switch.cs
@@ -6,7 +6,7 @@ using Newtonsoft.Json;
 [InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn), Order(-25)]
 public class SwitchData : BehaviorData
 {
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Switch(context, this, entity, item);
     }
@@ -17,14 +17,14 @@ public class Switch : IBehavior
     private SwitchData _data;
 
     private Entity Entity { get; }
-    private Gear Item { get; }
-    private GameContext Context { get; }
+    private EquippedItem Item { get; }
+    private ItemManager Context { get; }
 
     public BehaviorData Data => _data;
 
     public bool Activated { get; set; }
 
-    public Switch(GameContext context, SwitchData data, Entity entity, Gear item)
+    public Switch(ItemManager context, SwitchData data, Entity entity, EquippedItem item)
     {
         _data = data;
         Entity = entity;
diff --git a/Assets/Scripts/ServerShared/Behaviors/Thermotoggle.cs b/Assets/Scripts/ServerShared/Behaviors/Thermotoggle.cs
index ce07df084..d7d46bcc8 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Thermotoggle.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Thermotoggle.cs
@@ -12,7 +12,7 @@ public class ThermotoggleData : BehaviorData
     [InspectableField, JsonProperty("highPass"), Key(2)]
     public bool HighPass;
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Thermotoggle(context, this, entity, item);
     }
@@ -24,12 +24,12 @@ public class Thermotoggle : IBehavior
     private ThermotoggleData _data;
 
     private Entity Entity { get; }
-    private Gear Item { get; }
-    private GameContext Context { get; }
+    private EquippedItem Item { get; }
+    private ItemManager Context { get; }
 
     public BehaviorData Data => _data;
 
-    public Thermotoggle(GameContext context, ThermotoggleData data, Entity entity, Gear item)
+    public Thermotoggle(ItemManager context, ThermotoggleData data, Entity entity, EquippedItem item)
     {
         _data = data;
         Entity = entity;
@@ -40,6 +40,6 @@ public class Thermotoggle : IBehavior
 
     public bool Update(float delta)
     {
-        return Entity.Temperature < TargetTemperature ^ _data.HighPass;
+        return Item.Temperature < TargetTemperature ^ _data.HighPass;
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Behaviors/Thruster.cs b/Assets/Scripts/ServerShared/Behaviors/Thruster.cs
index 608e6e431..3a9f64b07 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Thruster.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Thruster.cs
@@ -15,7 +15,7 @@ public class ThrusterData : BehaviorData
     [InspectableField, JsonProperty("heat"), Key(3)]  
     public PerformanceStat Heat = new PerformanceStat();
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Thruster(context, this, entity, item);
     }
@@ -24,8 +24,8 @@ public class ThrusterData : BehaviorData
 public class Thruster : IAnalogBehavior
 {
     public Entity Entity { get; }
-    public Gear Item { get; }
-    public GameContext Context { get; }
+    public EquippedItem Item { get; }
+    public ItemManager Context { get; }
     
     public float Thrust { get; private set; }
 
@@ -41,7 +41,7 @@ public class Thruster : IAnalogBehavior
     
     private float _input;
 
-    public Thruster(GameContext context, ThrusterData data, Entity entity, Gear item)
+    public Thruster(ItemManager context, ThrusterData data, Entity entity, EquippedItem item)
     {
         Context = context;
         _data = data;
@@ -51,10 +51,10 @@ public class Thruster : IAnalogBehavior
 
     public bool Update(float delta)
     {
-        Thrust = Context.Evaluate(_data.Thrust, Item, Entity);
+        Thrust = Context.Evaluate(_data.Thrust, Item.EquippableItem, Entity);
         Entity.Velocity += Entity.Direction * _input * Thrust / Entity.Mass * delta;
-        Entity.AddHeat(_input * Context.Evaluate(_data.Heat, Item, Entity) * delta);
-        Entity.VisibilitySources[this] = _input * Context.Evaluate(_data.Visibility, Item, Entity);
+        Item.Temperature += (_input * Context.Evaluate(_data.Heat, Item.EquippableItem, Entity) * delta) / Context.GetThermalMass(Item.EquippableItem);
+        Entity.VisibilitySources[this] = _input * Context.Evaluate(_data.Visibility, Item.EquippableItem, Entity);
         return true;
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Behaviors/TowingController.cs b/Assets/Scripts/ServerShared/Behaviors/TowingController.cs
index aba3f61d9..34ac3ab76 100644
--- a/Assets/Scripts/ServerShared/Behaviors/TowingController.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/TowingController.cs
@@ -10,82 +10,70 @@ using static Unity.Mathematics.math;
 [MessagePackObject, JsonObject(MemberSerialization.OptIn), EntityTypeRestriction(HullType.Ship), Order(-100)]
 public class TowingControllerData : ControllerData
 {
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new TowingController(context, this, entity, item);
     }
 }
 
-public class TowingController : ControllerBase, IBehavior, IPersistentBehavior
+public class TowingController : ControllerBase<StationTowing>, IBehavior, IPersistentBehavior
 {
-    public override TaskType TaskType => TaskType.Tow;
     public BehaviorData Data => _data;
     
     private TowingControllerData _data;
-    private GameContext _context;
-    private Entity _entity;
-    private Gear _item;
+    private EquippedItem Item { get; }
     private bool _taskStarted;
     
-    public TowingController(GameContext context, TowingControllerData data, Entity entity, Gear item) : base(context, data, entity)
+    public TowingController(ItemManager itemManager, TowingControllerData data, Entity entity, EquippedItem item) : base(itemManager, data, entity)
     {
-        _context = context;
         _data = data;
-        _entity = entity;
-        _item = item;
+        Item = item;
     }
 
     public new bool Update(float delta)
     {
-        var towingTask = _context.Cache.Get<StationTowing>(Task);
-        if (towingTask != null)
+        if (Task != null)
         {
             if (!_taskStarted)
             {
-                MoveTo(towingTask.Zone, OnZoneArrival);
+                MoveTo(Task.Station, true, OnPickup);
                 _taskStarted = true;
             }
         }
         return base.Update(delta);
     }
     
-    void OnZoneArrival()
-    {
-        var towingTask = _context.Cache.Get<StationTowing>(Task);
-        
-        _entity.SetMessage("Entering pickup phase.");
-        
-        MoveTo(_context.Cache.Get<Entity>(towingTask.Station), true, OnPickup);
-    }
+    // void OnZoneArrival()
+    // {
+    //     var towingTask = _context.ItemData.Get<StationTowing>(Task);
+    //     
+    //     _entity.SetMessage("Entering pickup phase.");
+    //     
+    //     MoveTo(_context.ItemData.Get<Entity>(towingTask.Station), true, OnPickup);
+    // }
     
     void OnPickup()
     {
-        var towingTask = _context.Cache.Get<StationTowing>(Task);
-        var target = Zone.Entities[towingTask.Station] as OrbitalEntity;
+        Task.Station.SetParent(Entity);
         
-        target.SetParent(_entity);
-        
-        _entity.SetMessage("Entering delivery phase.");
+        Entity.SetMessage("Entering delivery phase.");
 
         MoveTo(() =>
         {
-            var orbitParent = Zone.GetOrbitPosition(towingTask.OrbitParent);
-            var parentToUs = _entity.Position - orbitParent;
-            return orbitParent + normalize(parentToUs) * towingTask.OrbitDistance;
-        }, () => Zone.GetOrbitVelocity(towingTask.OrbitParent), OnDelivery);
+            var orbitParent = Zone.GetOrbitPosition(Task.OrbitParent);
+            var parentToUs = Entity.Position - orbitParent;
+            return orbitParent + normalize(parentToUs) * Task.OrbitDistance;
+        }, () => Zone.GetOrbitVelocity(Task.OrbitParent), OnDelivery);
     }
     
     void OnDelivery()
     {
-        var towingTask = _context.Cache.Get<StationTowing>(Task);
-        var target = Zone.Entities[towingTask.Station] as OrbitalEntity;
+        Task.Station.RemoveParent();
         
-        target.RemoveParent();
-        
-        _entity.SetMessage("Target delivered. Returning Home.");
+        Entity.SetMessage("Target delivered. Returning Home.");
 
-        var orbit = Zone.CreateOrbit(towingTask.OrbitParent, _entity.Position);
-        target.OrbitData = orbit.ID;
+        var orbit = Zone.CreateOrbit(Task.OrbitParent, Entity.Position);
+        Task.Station.OrbitData = orbit.ID;
 
         FinishTask();
         _taskStarted = false;
@@ -109,5 +97,5 @@ public class TowingController : ControllerBase, IBehavior, IPersistentBehavior
 public class TowingControllerPersistence : PersistentBehaviorData
 {
     [JsonProperty("task"), Key(0)]
-    public Guid Task;
+    public StationTowing Task;
 }
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Behaviors/Trigger.cs b/Assets/Scripts/ServerShared/Behaviors/Trigger.cs
index a7ad5e3ba..724dc9059 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Trigger.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Trigger.cs
@@ -6,7 +6,7 @@ using Newtonsoft.Json;
 [InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn), Order(-20)]
 public class TriggerData : BehaviorData
 {
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Trigger(context, this, entity, item);
     }
@@ -17,8 +17,8 @@ public class Trigger : IBehavior
     private TriggerData _data;
 
     private Entity Entity { get; }
-    private Gear Item { get; }
-    private GameContext Context { get; }
+    private EquippedItem Item { get; }
+    private ItemManager Context { get; }
 
     public BehaviorData Data => _data;
 
@@ -29,7 +29,7 @@ public class Trigger : IBehavior
         _pulled = true;
     }
 
-    public Trigger(GameContext context, TriggerData data, Entity entity, Gear item)
+    public Trigger(ItemManager context, TriggerData data, Entity entity, EquippedItem item)
     {
         _data = data;
         Entity = entity;
diff --git a/Assets/Scripts/ServerShared/Behaviors/Turning.cs b/Assets/Scripts/ServerShared/Behaviors/Turning.cs
index 113e9d2bf..c17b0e3b5 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Turning.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Turning.cs
@@ -15,7 +15,7 @@ public class TurningData : BehaviorData
     [InspectableField, JsonProperty("heat"), Key(3)]  
     public PerformanceStat Heat = new PerformanceStat();
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Turning(context, this, entity, item);
     }
@@ -24,8 +24,8 @@ public class TurningData : BehaviorData
 public class Turning : IAnalogBehavior
 {
     public Entity Entity { get; }
-    public Gear Item { get; }
-    public GameContext Context { get; }
+    public EquippedItem Item { get; }
+    public ItemManager Context { get; }
     
     public float Torque { get; private set; }
 
@@ -41,7 +41,7 @@ public class Turning : IAnalogBehavior
     
     private float _input;
 
-    public Turning(GameContext context, TurningData data, Entity entity, Gear item)
+    public Turning(ItemManager context, TurningData data, Entity entity, EquippedItem item)
     {
         Context = context;
         _data = data;
@@ -55,10 +55,10 @@ public class Turning : IAnalogBehavior
 
     public bool Update(float delta)
     {
-        Torque = Context.Evaluate(_data.Torque, Item, Entity);
+        Torque = Context.Evaluate(_data.Torque, Item.EquippableItem, Entity);
         Entity.Direction = mul(Entity.Direction, Unity.Mathematics.float2x2.Rotate(_input * Torque / Entity.Mass * delta));
-        Entity.AddHeat(abs(_input) * Context.Evaluate(_data.Heat, Item, Entity) * delta);
-        Entity.VisibilitySources[this] = abs(_input) * Context.Evaluate(_data.Visibility, Item, Entity);
+        Item.Temperature += (abs(_input) * Context.Evaluate(_data.Heat, Item.EquippableItem, Entity) * delta) / Context.GetThermalMass(Item.EquippableItem);
+        Entity.VisibilitySources[this] = abs(_input) * Context.Evaluate(_data.Visibility, Item.EquippableItem, Entity);
         return true;
     }
 
diff --git a/Assets/Scripts/ServerShared/Behaviors/VelocityConversion.cs b/Assets/Scripts/ServerShared/Behaviors/VelocityConversion.cs
index 092dac6ac..39f2e5c73 100644
--- a/Assets/Scripts/ServerShared/Behaviors/VelocityConversion.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/VelocityConversion.cs
@@ -9,7 +9,7 @@ public class VelocityConversionData : BehaviorData
     [InspectableField, JsonProperty("traction"), Key(1), RuntimeInspectable]  
     public PerformanceStat Traction = new PerformanceStat();
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new VelocityConversion(context, this, entity, item);
     }
@@ -18,14 +18,14 @@ public class VelocityConversionData : BehaviorData
 public class VelocityConversion : IBehavior
 {
     public Entity Entity { get; }
-    public Gear Item { get; }
-    public GameContext Context { get; }
+    public EquippedItem Item { get; }
+    public ItemManager Context { get; }
 
     public BehaviorData Data => _data;
     
     private VelocityConversionData _data;
 
-    public VelocityConversion(GameContext context, VelocityConversionData data, Entity entity, Gear item)
+    public VelocityConversion(ItemManager context, VelocityConversionData data, Entity entity, EquippedItem item)
     {
         Context = context;
         _data = data;
diff --git a/Assets/Scripts/ServerShared/Behaviors/VelocityLimit.cs b/Assets/Scripts/ServerShared/Behaviors/VelocityLimit.cs
index f07104daf..7dc11d655 100644
--- a/Assets/Scripts/ServerShared/Behaviors/VelocityLimit.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/VelocityLimit.cs
@@ -9,7 +9,7 @@ public class VelocityLimitData : BehaviorData
     [InspectableField, JsonProperty("topSpeed"), Key(1), RuntimeInspectable]  
     public PerformanceStat TopSpeed = new PerformanceStat();
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new VelocityLimit(context, this, entity, item);
     }
@@ -19,8 +19,8 @@ public class VelocityLimitData : BehaviorData
 public class VelocityLimit : IBehavior
 {
     public Entity Entity { get; }
-    public Gear Item { get; }
-    public GameContext Context { get; }
+    public EquippedItem Item { get; }
+    public ItemManager Context { get; }
     
     public float Limit { get; private set; }
 
@@ -28,7 +28,7 @@ public class VelocityLimit : IBehavior
     
     private VelocityLimitData _data;
 
-    public VelocityLimit(GameContext context, VelocityLimitData data, Entity entity, Gear item)
+    public VelocityLimit(ItemManager context, VelocityLimitData data, Entity entity, EquippedItem item)
     {
         Context = context;
         _data = data;
@@ -42,7 +42,7 @@ public class VelocityLimit : IBehavior
 
     public bool Update(float delta)
     {
-        Limit = Context.Evaluate(_data.TopSpeed, Item, Entity);
+        Limit = Context.Evaluate(_data.TopSpeed, Item.EquippableItem, Entity);
         if (length(Entity.Velocity) > Limit)
             Entity.Velocity = normalize(Entity.Velocity) * Limit;
         return true;
diff --git a/Assets/Scripts/ServerShared/Behaviors/Visibility.cs b/Assets/Scripts/ServerShared/Behaviors/Visibility.cs
index 809b86439..2924efd07 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Visibility.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Visibility.cs
@@ -12,7 +12,7 @@ public class VisibilityData : BehaviorData
     [InspectableField, JsonProperty("visibilityDecay"), Key(2)]  
     public PerformanceStat VisibilityDecay = new PerformanceStat();
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new Visibility(context, this, entity, item);
     }
@@ -23,14 +23,14 @@ public class Visibility : IBehavior, IAlwaysUpdatedBehavior
     private VisibilityData _data;
 
     private Entity Entity { get; }
-    private Gear Item { get; }
-    private GameContext Context { get; }
+    private EquippedItem Item { get; }
+    private ItemManager Context { get; }
 
     public BehaviorData Data => _data;
 
     private float _cooldown; // Normalized
 
-    public Visibility(GameContext context, VisibilityData data, Entity entity, Gear item)
+    public Visibility(ItemManager context, VisibilityData data, Entity entity, EquippedItem item)
     {
         _data = data;
         Entity = entity;
@@ -40,14 +40,14 @@ public class Visibility : IBehavior, IAlwaysUpdatedBehavior
 
     public bool Update(float delta)
     {
-        Entity.VisibilitySources[this] = Context.Evaluate(_data.Visibility, Item, Entity);
+        Entity.VisibilitySources[this] = Context.Evaluate(_data.Visibility, Item.EquippableItem, Entity);
         return true;
     }
 
     public void AlwaysUpdate(float delta)
     {
         // TODO: Time independent decay?
-        Entity.VisibilitySources[this] *= Context.Evaluate(_data.VisibilityDecay, Item, Entity);
+        Entity.VisibilitySources[this] *= Context.Evaluate(_data.VisibilityDecay, Item.EquippableItem, Entity);
         
         if (Entity.VisibilitySources[this] < 0.01f) Entity.VisibilitySources.Remove(this);
     }
diff --git a/Assets/Scripts/ServerShared/Behaviors/WanderController.cs b/Assets/Scripts/ServerShared/Behaviors/WanderController.cs
index 03a24601b..fcb7d2180 100644
--- a/Assets/Scripts/ServerShared/Behaviors/WanderController.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/WanderController.cs
@@ -14,32 +14,26 @@ public class WanderControllerData : ControllerData
     [InspectableField, JsonProperty("randomDockTime"), Key(6)]  
     public float RandomDockTime = 5;
     
-    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item)
     {
         return new WanderController(context, this, entity, item);
     }
 }
 
-public class WanderController : ControllerBase, IBehavior
+public class WanderController : ControllerBase<WanderTask>, IBehavior
 {
     public WanderTarget WanderTarget;
-    public override TaskType TaskType => TaskType.None;
     public BehaviorData Data => _data;
     
     private WanderControllerData _data;
-    private GameContext _context;
-    private Entity _entity;
-    private Gear _item;
+    private EquippedItem Item { get; }
     private Guid _target;
     private float _dockTime = -1;
     
-    public WanderController(GameContext context, WanderControllerData data, Entity entity, Gear item) : base(context, data, entity)
+    public WanderController(ItemManager itemManager, WanderControllerData data, Entity entity, EquippedItem item) : base(itemManager, data, entity)
     {
-        _context = context;
         _data = data;
-        _entity = entity;
-        _item = item;
-        Task = Guid.NewGuid();
+        Item = item;
     }
 
     public new bool Update(float delta)
@@ -58,17 +52,17 @@ public class WanderController : ControllerBase, IBehavior
         if (WanderTarget == WanderTarget.Planets)
         {
             var planets = Zone.Planets.Values.ToArray();
-            var randomPlanet = planets[_context.Random.NextInt(planets.Length)];
+            var randomPlanet = planets[ItemManager.Random.NextInt(planets.Length)];
             MoveTo(() => Zone.GetOrbitPosition(randomPlanet.Orbit), () => Zone.GetOrbitVelocity(randomPlanet.Orbit));
         }
         else if (WanderTarget == WanderTarget.Orbitals)
         {
-            var entities = Zone.Entities.Values.ToArray();
-            var randomEntity = entities[_context.Random.NextInt(entities.Length)];
+            var entities = Zone.Entities.Where(e=>e is OrbitalEntity).ToArray();
+            var randomEntity = entities[ItemManager.Random.NextInt(entities.Length)];
             MoveTo(randomEntity, true, () =>
             {
-                _entity.SetParent(randomEntity);
-                _dockTime = _context.Random.NextFloat(_data.RandomDockTime);
+                Entity.SetParent(randomEntity);
+                _dockTime = ItemManager.Random.NextFloat(_data.RandomDockTime);
             });
         }
     }
diff --git a/Assets/Scripts/ServerShared/DatabaseEntry.cs b/Assets/Scripts/ServerShared/DatabaseEntry.cs
index 02ee0780c..e54fc66de 100644
--- a/Assets/Scripts/ServerShared/DatabaseEntry.cs
+++ b/Assets/Scripts/ServerShared/DatabaseEntry.cs
@@ -20,10 +20,10 @@ public interface INamedEntry
  Union(3, typeof(HullData)), 
  Union(4, typeof(SimpleCommodity)), 
  Union(5, typeof(CompoundCommodity)), 
- Union(6, typeof(Gear)),
+ Union(6, typeof(EquippableItem)),
  Union(7, typeof(BlueprintData)),
  Union(8, typeof(GalaxyMapLayerData)),
- Union(9, typeof(GlobalData)), 
+ // Union(9, typeof(GlobalData)), 
  Union(10, typeof(ZoneData)), 
  Union(11, typeof(PlayerData)), 
  Union(12, typeof(Corporation)),
@@ -50,5 +50,4 @@ public abstract class DatabaseEntry
 {
     [JsonProperty("id"), Key(0)]
     public Guid ID = Guid.NewGuid();
-    [IgnoreMember] public GameContext Context { get; set; }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Economy.Shared.Unity.asmdef b/Assets/Scripts/ServerShared/Economy.Shared.Unity.asmdef
index c5b48bb1a..cf376daa6 100644
--- a/Assets/Scripts/ServerShared/Economy.Shared.Unity.asmdef
+++ b/Assets/Scripts/ServerShared/Economy.Shared.Unity.asmdef
@@ -2,9 +2,9 @@
     "name": "Economy.Shared.Unity",
     "references": [
         "MessagePack",
-        "MagicOnion.Abstractions",
         "Unity.Mathematics",
-        "UniRx"
+        "UniRx",
+        "com.alelievr.NodeGraphProcessor.Runtime"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Assets/Scripts/ServerShared/Entity.cs b/Assets/Scripts/ServerShared/Entity.cs
index 3c2de4af0..e389aab52 100644
--- a/Assets/Scripts/ServerShared/Entity.cs
+++ b/Assets/Scripts/ServerShared/Entity.cs
@@ -1,4 +1,3 @@
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -6,69 +5,54 @@ using System.Reflection;
 using JsonKnownTypes;
 using MessagePack;
 using Newtonsoft.Json;
+using UniRx;
 using Unity.Mathematics;
 using static Unity.Mathematics.math;
+using int2 = Unity.Mathematics.int2;
 
 [MessagePackObject, 
  Union(0, typeof(Ship)),
  Union(1, typeof(OrbitalEntity)),
  JsonObject(MemberSerialization.OptIn), JsonConverter(typeof(JsonKnownTypesConverter<Entity>))]
-public abstract class Entity : DatabaseEntry, IMessagePackSerializationCallbackReceiver, INamedEntry
+public abstract class Entity
 {
-    [JsonProperty("temperature"), Key(1)]
-    public float Temperature;
+    public Zone Zone;
+    public EquippableItem Hull;
     
-    [JsonProperty("energy"), Key(2)]
-    public float Energy;
-    
-    [JsonProperty("position"), Key(3)]
     public float2 Position;
-    
-    [JsonProperty("direction"), Key(4)]
     public float2 Direction = float2(0,1);
-    
-    [JsonProperty("velocity"), Key(5)]
     public float2 Velocity;
     
-    [JsonProperty("cargo"), Key(6)]
-    public readonly HashSet<Guid> Cargo; // Type: ItemInstance
+    public float[,] Temperature;
+    public float Energy;
 
-    [JsonProperty("gear"), Key(7)]
-    public readonly List<Guid> Gear;
+    public readonly ReactiveCollection<EquippedItem> EquippedItems = new ReactiveCollection<EquippedItem>();
+    public readonly ReactiveCollection<EquippedCargoBay> EquippedCargoBays = new ReactiveCollection<EquippedCargoBay>();
+
+    public Entity Parent;
+    public List<Entity> Children = new List<Entity>();
     
-    [JsonProperty("parent"), Key(8)]
-    public Guid Parent; // Type: Entity
-    
-    [JsonProperty("children"), Key(9)]
-    public List<Guid> Children = new List<Guid>(); // Type: Entity
-    
-    [JsonProperty("hull"), Key(10)]
-    public Guid Hull; // Type: Gear
-    
-    [JsonProperty("persistedBehaviorData"), Key(11)]
-    public Dictionary<Guid, PersistentBehaviorData[]> PersistedBehaviors;
-    
-    [JsonProperty("corporation"), Key(12)]
-    public Guid Corporation;
-    
-    [JsonProperty("name"), Key(13)]
     public string Name;
     
-    [JsonProperty("population"), Key(14)]
     public int Population;
-    
-    [JsonProperty("personality"), Key(15)]
     public Dictionary<Guid, float> Personality = new Dictionary<Guid, float>();
     
-    [JsonProperty("incompleteGear"), Key(16)]
-    public Dictionary<Guid, double> IncompleteGear = new Dictionary<Guid, double>();
-    //public List<IncompleteItem> IncompleteGear = new List<IncompleteItem>();
+    public readonly Dictionary<string, float> Messages = new Dictionary<string, float>();
+    public readonly Dictionary<object, float> VisibilitySources = new Dictionary<object, float>();
     
-    [JsonProperty("incompleteCargo"), Key(17)]
-    public Dictionary<Guid, double> IncompleteCargo = new Dictionary<Guid, double>();
+    private List<IPopulationAssignment> PopulationAssignments = new List<IPopulationAssignment>();
+
 
-    [JsonProperty("active"), Key(18)]
     private bool _active;
+    private EquippedItem[,] _gearOccupancy;
+    private EquippedItem[,] _thermalOccupancy;
+    private HardpointData[,] _hardpoints;
+    
+    public ItemManager ItemManager { get; }
+    public int AssignedPopulation => PopulationAssignments.Sum(pa => pa.AssignedPopulation);
+    public float Mass { get; private set; }
+    public float Visibility => VisibilitySources.Values.Sum();
+    
     public bool Active
     {
         get => _active;
@@ -77,8 +61,8 @@ public abstract class Entity : DatabaseEntry, IMessagePackSerializationCallbackR
             _active = value;
             if (_active)
             {
-                foreach (var hardpoint in Hardpoints)
-                    if(hardpoint.Gear!=null)
+                foreach (var hardpoint in EquippedItems)
+                    if(hardpoint.EquippableItem!=null)
                         foreach (var behavior in hardpoint.Behaviors)
                         {
                             if(behavior is IInitializableBehavior initializableBehavior)
@@ -87,134 +71,45 @@ public abstract class Entity : DatabaseEntry, IMessagePackSerializationCallbackR
             }
         }
     }
-    //public List<IncompleteItem> IncompleteCargo = new List<IncompleteItem>();
 
-    [IgnoreMember] public Zone Zone;
-    [IgnoreMember] public List<Hardpoint> Hardpoints;
-    [IgnoreMember] public readonly Dictionary<object, float> VisibilitySources = new Dictionary<object, float>();
-    [IgnoreMember] public readonly Dictionary<string, float> Messages = new Dictionary<string, float>();
-    // [IgnoreMember] public Dictionary<Gear, EquippableItemData> GearData;
-    // [IgnoreMember] public Dictionary<Gear, List<IBehavior>> ItemBehaviors;
-
-    private List<IPopulationAssignment> PopulationAssignments = new List<IPopulationAssignment>();
-
-    [IgnoreMember] public int AssignedPopulation => PopulationAssignments.Sum(pa => pa.AssignedPopulation);
-    [IgnoreMember] public float Mass { get; private set; }
-    [IgnoreMember] public float OccupiedCapacity { get; private set; }
-    [IgnoreMember] public float ThermalMass { get; private set; }
-    [IgnoreMember] public float Visibility => VisibilitySources.Values.Sum();
-
-    public class ChangeEvent : IChangeSource
+    public Entity(ItemManager itemManager, Zone zone, EquippableItem hull)
     {
-        public event Action OnChanged;
-
-        public void Change()
-        {
-            OnChanged?.Invoke();
-        }
-    }
-    private bool _cargoChanged;
-    public ChangeEvent CargoEvent = new ChangeEvent();
-    
-    private bool _gearChanged;
-    public ChangeEvent GearEvent = new ChangeEvent();
-
-    public ChangeEvent ChildEvent = new ChangeEvent();
-
-    public float Capacity
-    {
-        get
-        {
-            var hull = Context.Cache.Get<Gear>(Hull);
-            var hullData = Context.Cache.Get<HullData>(hull.Data);
-            return Context.Evaluate(hullData.Capacity, hull, this);
-        }
-    }
-
-    [IgnoreMember] public string EntryName
-    {
-        get => Name;
-        set => Name = value;
-    }
-
-
-    public Entity(GameContext context, Guid hull, IEnumerable<Guid> gear, IEnumerable<Guid> cargo, Zone zone, Guid corporation)
-    {
-        Context = context;
+        ItemManager = itemManager;
         Zone = zone;
-        Corporation = corporation;
-
-        Gear = gear.ToList();
-        Cargo = new HashSet<Guid>(cargo);
         Hull = hull;
-
-        Hydrate();
     }
 
-    // private void GenerateHardpoints()
-    // {
-    //     
-    // }
-
-    public void Hydrate()
+    private void MapShip()
     {
-        //var gearIDs = EquippedItems.Append(Hull);
-        //var gear = gearIDs.ToDictionary(id => id, id => Context.Cache.Get<Gear>(id));
-        //GearData = gear.Values.ToDictionary(g => g, g => g.ItemData);
-        
-        Hardpoints = new List<Hardpoint>();
-        Hardpoints.Add(new Hardpoint
+        var hullData = ItemManager.GetData(Hull) as HullData;
+        _gearOccupancy = new EquippedItem[hullData.Shape.Width, hullData.Shape.Height];
+        _thermalOccupancy = new EquippedItem[hullData.Shape.Width, hullData.Shape.Height];
+        _hardpoints = new HardpointData[hullData.Shape.Width, hullData.Shape.Height];
+        foreach (var hardpoint in hullData.Hardpoints)
         {
-            HardpointData = new HardpointData{ Type = HardpointType.Hull }
-        });
-        var hull = Context.Cache.Get<Gear>(Hull);
-        Equip(hull, Hardpoints[0]);
-        
-        var hullData = Context.Cache.Get<HullData>(hull.Data);
-        Hardpoints.AddRange(hullData.Hardpoints.Select(hd => new Hardpoint {HardpointData = hd}));
-
-        // Create a copy of the gear list and remove every item actually equipped
-        var remainingGear = new List<Guid>(Gear);
-        foreach (var gearID in Gear)
-            if (Equip(gearID))
-                remainingGear.Remove(gearID);
-
-        foreach (var remaining in remainingGear)
-        {
-            Context.Log($"Item {Context.Cache.Get<Gear>(remaining).Name} equipped on entity {Name} has no compatible hardpoint, moved to cargo.");
-            Gear.Remove(remaining);
-            Cargo.Add(remaining);
+            foreach (var hardpointCoord in hardpoint.Shape.Coordinates)
+            {
+                var hullCoord = hardpoint.Position + hardpointCoord;
+                _hardpoints[hullCoord.x, hullCoord.y] = hardpoint;
+            }
         }
-        
-        if (_active)
-        {
-            foreach (var hardpoint in Hardpoints)
-                if(hardpoint.Gear!=null)
-                    foreach (var behavior in hardpoint.Behaviors)
-                    {
-                        if(behavior is IInitializableBehavior initializableBehavior)
-                            initializableBehavior.Initialize();
-                    }
-        }
-        
-        RecalculateMass();
     }
 
-    public void HydrateHardpoint(Hardpoint hardpoint)
+    public void Hydrate(EquippedItem equippedItem)
     {
-        if (hardpoint.Gear == null)
+        if (equippedItem.EquippableItem == null)
         {
-            Context.Log("Attempted to hydrate hardpoint with no gear on it!");
+            ItemManager.Log("Attempted to hydrate EquippedGear with no gear on it! This should be impossible!");
             return;
         }
 
-        hardpoint.ItemData = hardpoint.Gear.ItemData;
+        var gearData = ItemManager.GetData(equippedItem.EquippableItem);
 
-        hardpoint.Behaviors = hardpoint.Gear.ItemData.Behaviors
-            .Select(bd => bd.CreateInstance(Context, this, hardpoint.Gear))
+        equippedItem.Behaviors = gearData.Behaviors
+            .Select(bd => bd.CreateInstance(ItemManager, this, equippedItem))
             .ToArray();
         
-        hardpoint.BehaviorGroups = hardpoint.Behaviors
+        equippedItem.BehaviorGroups = equippedItem.Behaviors
             .GroupBy(b => b.Data.Group)
             .OrderBy(g=>g.Key)
             .Select(g=>new BehaviorGroup { 
@@ -225,385 +120,307 @@ public abstract class Entity : DatabaseEntry, IMessagePackSerializationCallbackR
                 })
             .ToArray();
 
-        foreach (var behavior in hardpoint.Behaviors)
+        foreach (var behavior in equippedItem.Behaviors)
         {
             if(behavior is IPopulationAssignment populationAssignment)
                 PopulationAssignments.Add(populationAssignment);
         }
     }
 
-    public void Unequip(Hardpoint hardpoint)
+    public EquippedCargoBay FindItemInCargo(Guid itemDataID)
     {
-        if (hardpoint.Gear != null)
+        return EquippedCargoBays.FirstOrDefault(c => c.ItemsOfType.ContainsKey(itemDataID));
+    }
+
+    // Attempts to move a given number of items of the given type to the target Entity
+    // Returns the number of items successfully transferred
+    public int TryTransferItems(Entity target, Guid itemDataID, int quantity)
+    {
+        int quantityTransferred = 0;
+        while (quantityTransferred < quantity)
         {
-            Gear.Remove(hardpoint.Gear.ID);
-            Cargo.Add(hardpoint.Gear.ID);
-            hardpoint.Gear = null;
-            _cargoChanged = true;
-            _gearChanged = true;
+            EquippedCargoBay originInventory = EquippedCargoBays.FirstOrDefault(c => c.ItemsOfType.ContainsKey(itemDataID));
+
+            if (originInventory == null) break;
+
+            var itemInstance = originInventory.ItemsOfType[itemDataID][0];
+
+            if (itemInstance is SimpleCommodity simpleCommodity)
+            {
+                var targetQuantity = min(simpleCommodity.Quantity, quantity - quantityTransferred);
+                if (!target.EquippedCargoBays.Any(c => originInventory.TryTransferItem(c, simpleCommodity, targetQuantity)))
+                {
+                    quantityTransferred += targetQuantity - simpleCommodity.Quantity;
+                    break;
+                }
+
+                quantityTransferred += targetQuantity;
+            }
+            else if (itemInstance is CraftedItemInstance craftedItemInstance)
+            {
+                if (!target.EquippedCargoBays.Any(c => originInventory.TryTransferItem(c, craftedItemInstance)))
+                    break;
+                
+                quantityTransferred++;
+            }
         }
+
+        return quantityTransferred;
     }
 
-    public void Equip(Gear gear, Hardpoint hardpoint)
+    public EquippableItem Unequip(EquippedItem item)
     {
-        // Hardpoint is occupied, remove existing item from gear list
-        if (hardpoint.Gear != null) Unequip(hardpoint);
-        if (Cargo.Contains(gear.ID)) Cargo.Remove(gear.ID);
+        if (item.EquippableItem == null)
+        {
+            ItemManager.Log("Attempted to remove equipped item with no equippable item on it! This should be impossible!");
+            return null;
+        }
 
-        hardpoint.Gear = gear;
-        HydrateHardpoint(hardpoint);
-        _gearChanged = true;
+        if (item is EquippedCargoBay cargoBay)
+        {
+            if(cargoBay.Cargo.Count > 0)
+            {
+                ItemManager.Log("Attempted to remove cargo bay that is not empty! Please check first before doing this!");
+                return null;
+            }
+
+            EquippedCargoBays.Remove(cargoBay);
+        }
+        
+        EquippedItems.Remove(item);
+        
+        var itemData = ItemManager.GetData(item.EquippableItem);
+        foreach (var i in itemData.Shape.Coordinates)
+        {
+            var itemCoord = item.Position + itemData.Shape.Rotate(i, item.EquippableItem.Rotation);
+            (itemData.HardpointType == HardpointType.Thermal ? _thermalOccupancy : _gearOccupancy)[itemCoord.x, itemCoord.y] = null;
+        }
+
+        return item.EquippableItem;
     }
 
-    public bool Equip(Guid gearID, bool force = false)
+    // Check whether the given item will fit when its origin is placed at the given coordinate
+    private bool ItemFits(EquippableItemData itemData, HullData hullData, EquippableItem item, int2 hullCoord)
     {
-        // Check all portions of inventory for a matching item
-        if (Cargo.Contains(gearID)) Cargo.Remove(gearID);
-        else if (IncompleteGear.ContainsKey(gearID))
-            IncompleteGear.Remove(gearID);
-        else if(!Gear.Contains(gearID))
-            throw new ArgumentException("Attempted to equip gear which is not present in inventory!");
-        
-        var gear = Context.Cache.Get<Gear>(gearID);
-        var gearData = Context.Cache.Get<GearData>(gear.Data);
-        
-        // Find an empty hardpoint of the correct type
-        var hardpoint = Hardpoints
-            .FirstOrDefault(hp => hp.Gear == null && hp.HardpointData.Type == gearData.HardpointType);
+        // Items without specific hardpoints on the ship can be freely rotated and placed anywhere
+        if (itemData.HardpointType == HardpointType.Tool || itemData.HardpointType == HardpointType.Thermal)
+        {
+            // Check every cell of the item's shape
+            foreach (var i in itemData.Shape.Coordinates)
+            {
+                // If there is any gear already occupying that space, it won't fit
+                // Thermal items have their own layer and do not collide with gear
+                var itemCoord = hullCoord + itemData.Shape.Rotate(i, item.Rotation);
+                if (!hullData.InteriorCells[itemCoord] || (itemData.HardpointType == HardpointType.Thermal ? _thermalOccupancy : _gearOccupancy)[itemCoord.x, itemCoord.y] != null) return false;
+            }
+        }
+        else
+        {
+            var hardpoint = _hardpoints[hullCoord.x, hullCoord.y];
+            
+            // If there's no hardpoint there, it won't fit
+            if (hardpoint == null) return false;
 
-        // With force option enabled, we'll try to find an empty hardpoint but otherwise any will do
-        if (hardpoint == null && force)
-            hardpoint = Hardpoints
-                .FirstOrDefault(hp => hp.HardpointData.Type == gearData.HardpointType);
+            // If the hardpoint type doesn't match the item, it won't fit
+            if (hardpoint.Type != itemData.HardpointType) return false;
+            
+            // Check every cell of the item's shape
+            foreach (var i in itemData.Shape.Coordinates)
+            {
+                // If the hardpoint does not have a matching cell, it wont fit
+                if (!hardpoint.Shape[i]) return false;
+            
+                // If there is any gear already occupying that space, it won't fit
+                var itemCoord = hardpoint.Position + i;
+                if (_gearOccupancy[itemCoord.x, itemCoord.y] != null) return false;
+            }
+        }
 
-        // No compatible hardpoint found, return false
-        if (hardpoint == null)
-            return false;
-
-        Equip(gear, hardpoint);
         return true;
     }
 
-    public CraftedItemInstance AddCargo(CraftedItemInstance item)
+    // Check whether the given item will fit when its origin is placed at the given coordinate on the hull
+    public bool ItemFits(EquippableItem item, int2 hullCoord)
     {
-        Cargo.Add(item.ID);
-        Mass += item.Mass;
-        ThermalMass += item.ThermalMass;
-        OccupiedCapacity += item.Size;
-        _cargoChanged = true;
-        return item;
+        var itemData = ItemManager.GetData(item);
+        var hullData = ItemManager.GetData(Hull) as HullData;
+        return ItemFits(itemData, hullData, item, hullCoord);
     }
 
-    public CraftedItemInstance RemoveCargo(CraftedItemInstance item)
+    public bool TryFindSpace(EquippableItem item, out int2 hullCoord)
     {
-        if(!Cargo.Contains(item.ID))
-            throw new ArgumentException("Attempted to remove an item which is not in cargo!");
-        Cargo.Remove(item.ID);
-        Mass -= item.Mass;
-        ThermalMass -= item.ThermalMass;
-        OccupiedCapacity -= item.Size;
-        _cargoChanged = true;
-        return item;
-    }
-
-    public SimpleCommodity AddCargo(SimpleCommodity item)
-    {
-        // Regardless of whether a match is found, the item's mass and size are added to the entity
-        Mass += item.Mass;
-        ThermalMass += item.ThermalMass;
-        OccupiedCapacity += item.Size;
+        var itemData = ItemManager.GetData(item);
+        var hullData = ItemManager.GetData(Hull) as HullData;
         
-        // Try to find an matching instance of the same commodity in cargo
-        var existingCommodityID = Cargo.FirstOrDefault(id =>
-            Context.Cache.Get<ItemInstance>(id) is SimpleCommodity simpleCommodity &&
-            simpleCommodity.ItemData == item.ItemData);
-        
-        // A match was found, delete the original item and increment the quantity of the match
-        if (existingCommodityID != Guid.Empty)
+        // Tools and thermal equipment can be installed anywhere on the ship
+        // Search the whole ship for somewhere the item will fit
+        if (itemData.HardpointType == HardpointType.Tool || itemData.HardpointType == HardpointType.Thermal)
         {
-            var existingCommodity = Context.Cache.Get<SimpleCommodity>(existingCommodityID);
-            existingCommodity.Quantity += item.Quantity;
-            Context.Cache.Delete(item);
-            _cargoChanged = true;
-            return existingCommodity;
+            foreach (var hullCoord2 in hullData.InteriorCells.Coordinates)
+            {
+                if (ItemFits(itemData, hullData, item, hullCoord2))
+                {
+                    hullCoord = hullCoord2;
+                    return true;
+                }
+            }
         }
         
-        // No match was found, simply add the item instance to the cargo
-        Cargo.Add(item.ID);
-        _cargoChanged = true;
-        return item;
-    }
-
-    public SimpleCommodity RemoveCargo(SimpleCommodity item, int quantity)
-    {
-        if(!Cargo.Contains(item.ID))
-            throw new ArgumentException("Attempted to remove an item which is not in cargo!");
-        
-        // If the quantity matches exactly, huzzah, just remove the instance from cargo
-        if (item.Quantity == quantity)
-            Cargo.Remove(item.ID);
+        // Everything else has to be equipped onto a hardpoint of the same type
+        // Search the ship for an empty hardpoint that matches the type and shape of the item
         else
         {
-            // Quantity does not match, create new item instance and decrement source quantity
-            var newSimpleCommodity = new SimpleCommodity
+            foreach (var hardpoint in hullData.Hardpoints)
             {
-                Context = Context,
-                Data = item.Data,
-                Quantity = quantity
-            };
-            Context.Cache.Add(newSimpleCommodity);
-            item.Quantity -= quantity;
-            item = newSimpleCommodity;
+                if(hardpoint.Type == itemData.HardpointType)
+                {
+                    foreach (var hardpointCoord in hardpoint.Shape.Coordinates)
+                    {
+                        var hullCoord2 = hardpoint.Position + hardpointCoord;
+                        if (ItemFits(itemData, hullData, item, hullCoord2))
+                        {
+                            hullCoord = hullCoord2;
+                            return true;
+                        }
+                    }
+                }
+            }
         }
         
-        Mass -= item.Mass;
-        ThermalMass -= item.ThermalMass;
-        OccupiedCapacity -= item.Size;
+        hullCoord = int2.zero;
+        return false;
+    }
+
+    // Try to equip the given item anywhere it will fit, returns true when the item was successfully equipped
+    public bool TryEquip(EquippableItem item) => TryFindSpace(item, out var hullCoord) && TryEquip(item, hullCoord);
+
+    // Try to equip the given item to the given location
+    public bool TryEquip(EquippableItem item, int2 hullCoord)
+    {
+        var itemData = ItemManager.GetData(item);
+        var hullData = ItemManager.GetData(Hull) as HullData;
+
+        if (!ItemFits(itemData, hullData, item, hullCoord)) return false;
+        
+        if (itemData.HardpointType == HardpointType.Tool || itemData.HardpointType == HardpointType.Thermal)
+        {
+            EquippedItem equippedItem;
+            if(itemData is CargoBayData)
+            {
+                equippedItem = new EquippedCargoBay(ItemManager, item, hullCoord);
+                EquippedCargoBays.Add((EquippedCargoBay) equippedItem);
+            }
+            else
+            {
+                equippedItem = new EquippedItem(ItemManager, item, hullCoord);
+                EquippedItems.Add(equippedItem);
+            }
+
+            foreach (var i in itemData.Shape.Coordinates)
+            {
+                var occupiedCoord = hullCoord + itemData.Shape.Rotate(i, item.Rotation);
+                (itemData.HardpointType == HardpointType.Thermal ? _thermalOccupancy : _gearOccupancy)[occupiedCoord.x, occupiedCoord.y] = equippedItem;
+            }
+                
+            Hydrate(equippedItem);
+            return true;
+        }
+        else
+        {
+            var equippedItem = new EquippedItem(ItemManager, item, hullCoord);
+            EquippedItems.Add(equippedItem);
+            
+            foreach (var i in itemData.Shape.Coordinates)
+            {
+                var occupiedCoord = hullCoord + i;
+                (itemData.HardpointType == HardpointType.Thermal ? _thermalOccupancy : _gearOccupancy)[occupiedCoord.x, occupiedCoord.y] = equippedItem;
+            }
+                
+            Hydrate(equippedItem);
+            return true;
+        }
 
-        _cargoChanged = true;
-        return item;
     }
 
     public void AddChild(Entity entity)
     {
         Mass += entity.Mass;
-        ThermalMass += entity.ThermalMass;
-        Children.Add(entity.ID);
-        ChildEvent.Change();
+        Children.Add(entity);
     }
 
     public void RemoveChild(Entity entity)
     {
         Mass -= entity.Mass;
-        ThermalMass -= entity.ThermalMass;
-        Children.Remove(entity.ID);
-        ChildEvent.Change();
+        Children.Remove(entity);
     }
     
     public void SetParent(Entity parent)
     {
-        Parent = parent.ID;
+        Parent = parent;
         parent.AddChild(this);
     }
 
     public void RemoveParent()
     {
-        if (Parent == Guid.Empty)
+        if (Parent == null)
             return;
 
-        var parent = Zone.Entities[Parent];
-        parent.RemoveChild(this);
-        Parent = Guid.Empty;
-    }
-
-    public Guid Build(BlueprintData blueprint, float quality, string name, bool direct = false)
-    {
-        if (direct)
-        {
-            if(blueprint.FactoryItem!=Guid.Empty)
-                throw new ArgumentException("Attempted to directly build a blueprint which requires a factory!");
-            var blueprintItem = Context.Cache.Get<GearData>(blueprint.Item);
-            if(blueprintItem == null)
-                throw new ArgumentException("Attempted to directly build a blueprint for a missing or incompatible item!");
-        }
-
-        //var newItemID = Guid.Empty;
-
-        // GetBlueprintIngredients will assign the output lists with the items matching the blueprint, and return false if they are not found
-        if (!GetBlueprintIngredients(blueprint, out var simpleIngredients, out var compoundIngredients))
-            return Guid.Empty;
-        
-        // These will be bundled with the data for the compound commodity instance
-        var ingredients = new List<ItemInstance>();
-        ingredients.AddRange(compoundIngredients.Select(RemoveCargo));
-        ingredients.AddRange(simpleIngredients.Select(sc => RemoveCargo(sc, blueprint.Ingredients[sc.Data])));
-            
-        var blueprintItemData = Context.Cache.Get(blueprint.Item);
-        
-        // Creating new crafted item instances is a bit more complicated
-        if (blueprintItemData is CraftedItemData)
-        {
-            CraftedItemInstance newItem;
-            
-            if (blueprintItemData is EquippableItemData equippableItemData)
-            {
-                var newGear = new Gear
-                {
-                    Context = Context,
-                    Data = blueprintItemData.ID,
-                    Ingredients = ingredients.Select(ii=>ii.ID).ToList(),
-                    Quality = quality,
-                    Blueprint = blueprint.ID,
-                    Name = name,
-                    SourceEntity = ID
-                };
-                newGear.Durability = Context.Evaluate(equippableItemData.Durability, newGear);
-                newItem = newGear;
-            }
-            else
-            {
-                newItem = new CompoundCommodity
-                {
-                    Context = Context,
-                    Data = blueprintItemData.ID,
-                    Ingredients = ingredients.Select(ii=>ii.ID).ToList(),
-                    Quality = quality,
-                    Blueprint = blueprint.ID,
-                    Name = name,
-                    SourceEntity = ID
-                };
-            }
-            Context.Cache.Add(newItem);
-            if (direct)
-                IncompleteGear[newItem.ID] = blueprint.ProductionTime;
-            else 
-                IncompleteCargo[newItem.ID] = blueprint.ProductionTime;
-            return newItem.ID;
-        }
-
-        var newSimpleCommodity = new SimpleCommodity
-        {
-            Context = Context,
-            Data = blueprintItemData.ID,
-            Quantity = 1
-        };
-        Context.Cache.Add(newSimpleCommodity);
-        IncompleteCargo[newSimpleCommodity.ID] = blueprint.ProductionTime;
-        return newSimpleCommodity.ID;
-    }
-
-    public bool GetBlueprintIngredients(BlueprintData blueprint, out List<SimpleCommodity> simpleIngredients,
-        out List<CompoundCommodity> compoundIngredients)
-    {
-        simpleIngredients = new List<SimpleCommodity>();
-        compoundIngredients = new List<CompoundCommodity>();
-        var hasAllIngredients = true;
-        var cargoInstances = Cargo.Select(c => Context.Cache.Get<ItemInstance>(c));
-        foreach (var kvp in blueprint.Ingredients)
-        {
-            var itemData = Context.Cache.Get(kvp.Key);
-            if (itemData is SimpleCommodityData)
-            {
-                var matchingItem = cargoInstances.FirstOrDefault(ii =>
-                {
-                    if (!(ii is SimpleCommodity simpleCommodity)) return false;
-                    return simpleCommodity.Data == itemData.ID && simpleCommodity.Quantity >= kvp.Value;
-                }) as SimpleCommodity;
-                hasAllIngredients = hasAllIngredients && matchingItem != null;
-                if(matchingItem != null)
-                    simpleIngredients.Add(matchingItem);
-            }
-            else
-            {
-                var matchingItems =
-                    cargoInstances.Where(ii => (ii as CompoundCommodity)?.Data == itemData.ID).Cast<CompoundCommodity>().ToArray();
-                hasAllIngredients = hasAllIngredients && matchingItems.Length >= kvp.Value;
-                if(matchingItems.Length >= kvp.Value)
-                    compoundIngredients.AddRange(matchingItems.Take(kvp.Value));
-            }
-        }
-
-        return hasAllIngredients;
-    }
-
-    public void RecalculateMass()
-    {
-        Mass = Context.Cache.Get<Gear>(Hull).Mass + 
-            Gear.Select(i => Context.Cache.Get<Gear>(i)).Sum(i => i.Mass) + 
-            IncompleteGear.Select(i => Context.Cache.Get<Gear>(i.Key)).Sum(i => i.Mass) + 
-            Cargo.Select(i => Context.Cache.Get<ItemInstance>(i)).Sum(ii => ii.Mass) + 
-            IncompleteCargo.Select(i => Context.Cache.Get<ItemInstance>(i.Key)).Sum(ii => ii.Mass) + 
-            Children.Select(i => Context.Cache.Get<Entity>(i)).Sum(c=>c.Mass);
-        
-        ThermalMass = Context.Cache.Get<Gear>(Hull).ThermalMass + 
-                       Gear.Select(i => Context.Cache.Get<Gear>(i)).Sum(i => i.ThermalMass) +
-                       IncompleteGear.Select(i => Context.Cache.Get<Gear>(i.Key)).Sum(i => i.ThermalMass) + 
-                       Cargo.Select(i => Context.Cache.Get<ItemInstance>(i)).Sum(ii => ii.ThermalMass) + 
-                       IncompleteCargo.Select(i => Context.Cache.Get<ItemInstance>(i.Key)).Sum(ii => ii.ThermalMass) + 
-                       Children.Select(i => Context.Cache.Get<Entity>(i)).Sum(c=>c.ThermalMass);
-
-        OccupiedCapacity = Gear.Select(i => Context.Cache.Get<Gear>(i)).Sum(i => i.Size) +
-                           Cargo.Select(i => Context.Cache.Get<ItemInstance>(i)).Sum(ii => ii.Size);
+        Parent.RemoveChild(this);
+        Parent = null;
     }
 
     public T GetBehavior<T>() where T : class, IBehavior
     {
-        foreach (var hardpoint in Hardpoints)
-            if(hardpoint.Gear!=null)
-                foreach (var behavior in hardpoint.Behaviors)
-                    if (behavior is T b)
-                        return b;
+        foreach (var equippedItem in EquippedItems)
+            foreach (var behavior in equippedItem.Behaviors)
+                if (behavior is T b)
+                    return b;
         return null;
     }
 
     public IEnumerable<T> GetBehaviors<T>() where T : class, IBehavior
     {
-        foreach (var hardpoint in Hardpoints)
-            if(hardpoint.Gear!=null)
-                foreach (var behavior in hardpoint.Behaviors)
-                    if (behavior is T b)
-                        yield return b;
+        foreach (var equippedItem in EquippedItems)
+            foreach (var behavior in equippedItem.Behaviors)
+                if (behavior is T b)
+                    yield return b;
     }
 
     public IEnumerable<T> GetBehaviorData<T>() where T : BehaviorData
     {
-        foreach (var hardpoint in Hardpoints)
-            if(hardpoint.Gear!=null)
-                foreach (var behavior in hardpoint.Behaviors)
-                    if (behavior.Data is T b)
-                        yield return b;
+        foreach (var equippedItem in EquippedItems)
+            foreach (var behavior in equippedItem.Behaviors)
+                if (behavior.Data is T b)
+                    yield return b;
     }
 
     public Switch GetSwitch<T>() where T : class, IBehavior
     {
-        foreach (var hardpoint in Hardpoints)
-            if(hardpoint.Gear!=null)
-                foreach (var group in hardpoint.BehaviorGroups)
-                    foreach(var behavior in group.Behaviors)
-                        if (behavior is T)
-                            return group.Switch;
+        foreach (var equippedItem in EquippedItems)
+            foreach (var group in equippedItem.BehaviorGroups)
+                foreach(var behavior in group.Behaviors)
+                    if (behavior is T)
+                        return group.Switch;
         return null;
     }
 
     public Trigger GetTrigger<T>() where T : class, IBehavior
     {
-        foreach (var hardpoint in Hardpoints)
-            if(hardpoint.Gear!=null)
-                foreach (var group in hardpoint.BehaviorGroups)
-                    foreach(var behavior in group.Behaviors)
-                        if (behavior is T)
-                            return group.Trigger;
+        foreach (var equippedItem in EquippedItems)
+            foreach (var group in equippedItem.BehaviorGroups)
+                foreach(var behavior in group.Behaviors)
+                    if (behavior is T)
+                        return group.Trigger;
         return null;
     }
 
-    public void AddHeat(float heat)
-    {
-        if (Parent != Guid.Empty)
-        {
-            // var parent = Context.Cache.Get<Entity>(Parent);
-            // parent.AddHeat(heat);
-        }
-        else
-            Temperature += heat / ThermalMass;
-
-    }
-
     public virtual void Update(float delta)
     {
         if (Active)
         {
-            foreach (var hardpoint in Hardpoints.Where(hp=>hp.Gear!=null))
+            foreach (var equippedItem in EquippedItems)
             {
-                foreach (var group in hardpoint.BehaviorGroups)
-                foreach(var behavior in group.Behaviors)
-                    if(!behavior.Update(delta))
-                        break;
-            
-                foreach (var behavior in hardpoint.Behaviors.Where(b => b is IAlwaysUpdatedBehavior).Cast<IAlwaysUpdatedBehavior>())
-                    behavior.AlwaysUpdate(delta);
-            
-                if(hardpoint.Gear.ItemData.Performance(Temperature) < .01f)
-                    hardpoint.Gear.Durability -= delta;
+                equippedItem.Update(delta);
             }
 
             foreach (var message in Messages.Keys.ToArray())
@@ -612,76 +429,354 @@ public abstract class Entity : DatabaseEntry, IMessagePackSerializationCallbackR
                 if (Messages[message] < 0)
                     Messages.Remove(message);
             }
-
-            foreach (var incompleteGear in IncompleteGear.Keys.ToArray())
-            {
-                IncompleteGear[incompleteGear] = IncompleteGear[incompleteGear] - delta;
-                if (IncompleteGear[incompleteGear] < 0) Equip(incompleteGear);
-            }
         }
 
-        if (Parent != Guid.Empty)
+        if (Parent != null)
         {
-            var parent = Context.Cache.Get<Entity>(Parent);
-            Position = parent.Position;
-            Velocity = parent.Velocity;
-            Temperature = parent.Temperature;
-        }
-
-        if (_cargoChanged)
-        {
-            CargoEvent.Change();
-            _cargoChanged = false;
-        }
-        if (_gearChanged)
-        {
-            GearEvent.Change();
-            _gearChanged = false;
+            Position = Parent.Position;
+            Velocity = Parent.Velocity;
         }
     }
 
     public void SetMessage(string message)
     {
-        Messages[message] = Context.GlobalData.MessageDuration;
+        Messages[message] = ItemManager.GameplaySettings.MessageDuration;
     }
 
-    public void OnBeforeSerialize()
+    // public void OnBeforeSerialize()
+    // {
+    //     // Filter item behavior collections by those with any persistent behaviors
+    //     // For each item create an object containing the item ID and a list of persistent behaviors
+    //     // Then turn that into a dictionary mapping from item ID to an array of every behaviors persistent data
+    //     PersistedBehaviors = EquippedItems
+    //         .Where(item => item.Behaviors.Any(b=>b is IPersistentBehavior))
+    //         .Select(item => new {equippable=item, behaviors = item.Behaviors
+    //             .Where(b=>b is IPersistentBehavior)
+    //             .Cast<IPersistentBehavior>()})
+    //         .ToDictionary(x=> x.equippable.Position, x=>x.behaviors.Select(b => b.Store()).ToArray());
+    // }
+    //
+    // public void OnAfterDeserialize()
+    // {
+    //     foreach(var item in EquippedItems)
+    //         Hydrate(item);
+    //
+    //     // Iterate only over the behaviors of items which contain persistent data
+    //     // Filter the behaviors for each item to get the persistent ones, then cast them and combine with the persisted data array for that item
+    //     foreach (var persistentBehaviorData in EquippedItems
+    //         .Where(item => PersistedBehaviors.ContainsKey(item.Position))
+    //         .SelectMany(item => item.Behaviors
+    //             .Where(b=> b is IPersistentBehavior)
+    //             .Cast<IPersistentBehavior>()
+    //             .Zip(PersistedBehaviors[item.Position], (behavior, data) => new{behavior, data})))
+    //         persistentBehaviorData.behavior.Restore(persistentBehaviorData.data);
+    // }
+}
+
+[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
+public class EquippedItem
+{
+    [JsonProperty("item"), Key(0)] public EquippableItem EquippableItem;
+
+    [JsonProperty("position"), Key(1)] public int2 Position;
+
+    [JsonProperty("temperature"), Key(2)] public float Temperature;
+    
+    [IgnoreMember]
+    public IBehavior[] Behaviors;
+    
+    [IgnoreMember]
+    public BehaviorGroup[] BehaviorGroups;
+    
+    protected readonly ItemManager _itemManager;
+    private readonly EquippableItemData _data;
+
+    public EquippedItem(ItemManager itemManager, EquippableItem item, int2 position)
     {
-        // Filter item behavior collections by those with any persistent behaviors
-        // For each item create an object containing the item ID and a list of persistent behaviors
-        // Then turn that into a dictionary mapping from item ID to an array of every behaviors persistent data
-        PersistedBehaviors = Hardpoints
-            .Where(hp => hp.Behaviors.Any(b=>b is IPersistentBehavior))
-            .Select(hp => new {gear=hp.Gear, behaviors = hp.Behaviors
-                .Where(b=>b is IPersistentBehavior)
-                .Cast<IPersistentBehavior>()})
-            .ToDictionary(x=> x.gear.ID, x=>x.behaviors.Select(b => b.Store()).ToArray());
+        _itemManager = itemManager;
+        _data = _itemManager.GetData(item);
+        EquippableItem = item;
+        Position = position;
     }
 
-    public void OnAfterDeserialize()
+    public void Update(float delta)
     {
-        Hydrate();
-
-        // Iterate only over the behaviors of items which contain persistent data
-        // Filter the behaviors for each item to get the persistent ones, then cast them and combine with the persisted data array for that item
-        foreach (var persistentBehaviorData in Hardpoints
-            .Where(hardpoint => PersistedBehaviors.ContainsKey(hardpoint.Gear.ID)).
-            SelectMany(hardpoint => hardpoint.Behaviors
-                .Where(b=> b is IPersistentBehavior)
-                .Cast<IPersistentBehavior>()
-                .Zip(PersistedBehaviors[hardpoint.Gear.ID], (behavior, data) => new{behavior, data})))
-            persistentBehaviorData.behavior.Restore(persistentBehaviorData.data);
+        if(Temperature < _data.MinimumTemperature || Temperature > _data.MaximumTemperature)
+        {
+            EquippableItem.Durability -= delta;
+            return;
+        }
+        
+        foreach (var group in BehaviorGroups)
+        {
+            foreach (var behavior in group.Behaviors)
+            {
+                if (!behavior.Update(delta))
+                    break;
+            }
+        }
+            
+        foreach (var behavior in Behaviors.Where(b => b is IAlwaysUpdatedBehavior).Cast<IAlwaysUpdatedBehavior>())
+            behavior.AlwaysUpdate(delta);
     }
 }
 
-//[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
-public class Hardpoint
+public class EquippedCargoBay : EquippedItem
 {
-    public Gear Gear;
-    public EquippableItemData ItemData;
-    public HardpointData HardpointData;
-    public IBehavior[] Behaviors;
-    public BehaviorGroup[] BehaviorGroups;
+    public readonly ReactiveDictionary<ItemInstance, int2> Cargo = new ReactiveDictionary<ItemInstance, int2>();
+
+    public readonly ItemInstance[,] Occupancy;
+
+    public readonly Dictionary<Guid, List<ItemInstance>> ItemsOfType = new Dictionary<Guid, List<ItemInstance>>();
+    
+    private readonly CargoBayData _cargoData;
+    
+    public float Mass { get; private set; }
+    public float ThermalMass { get; private set; }
+    
+    public EquippedCargoBay(ItemManager itemManager, EquippableItem item, int2 position) : base(itemManager, item, position)
+    {
+        _cargoData = _itemManager.GetData(EquippableItem) as CargoBayData;
+
+        Mass = _cargoData.Mass;
+        ThermalMass = _cargoData.Mass * _cargoData.SpecificHeat;
+        
+        Occupancy = new ItemInstance[_cargoData.InteriorShape.Width,_cargoData.InteriorShape.Height];
+    }
+
+    // Check whether the given item will fit when its origin is placed at the given coordinate
+    private bool ItemFits(ItemInstance item, int2 cargoCoord)
+    {
+        var itemData = _itemManager.GetData(item);
+        // Check every cell of the item's shape
+        foreach (var i in itemData.Shape.Coordinates)
+        {
+            // If there is an item already occupying that space, it won't fit
+            var itemCargoCoord = cargoCoord + itemData.Shape.Rotate(i, item.Rotation);
+            if (Occupancy[itemCargoCoord.x, itemCargoCoord.y] != null) return false;
+        }
+
+        return true;
+    }
+
+    // Tries to find a place to put the given items in the inventory
+    // Will attempt to fill existing item stacks first
+    // Returns true only when ALL of the items have places to go
+    public bool TryFindSpace(SimpleCommodity item, out List<int2> positions)
+    {
+        positions = new List<int2>();
+        var itemData = _itemManager.GetData(item);
+        var remainingQuantity = item.Quantity;
+        
+        // For simple commodities, search for existing item stacks to add to
+        foreach (var cargoItem in Cargo.Keys)
+        {
+            if (item.Data != cargoItem.Data) continue;
+            
+            var cargoCommodity = (SimpleCommodity) cargoItem;
+            if (cargoCommodity.Quantity >= itemData.MaxStack) continue;
+            
+            // Subtract remaining space in existing stack from remaining quantity
+            remainingQuantity -= min(itemData.MaxStack - cargoCommodity.Quantity, remainingQuantity);
+            positions.Add(Cargo[cargoItem]);
+            
+            // If we've moved all of the items into existing stacks, no need to search for empty space!
+            if (remainingQuantity == 0) return true;
+        }
+        
+        // Search all the space in the cargo bay for an empty space where the item fits
+        foreach (var cargoCoord in _cargoData.InteriorShape.Coordinates)
+        {
+            if (ItemFits(item, cargoCoord))
+            {
+                positions.Add(cargoCoord);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    // Attempts to store all of the given item anywhere in the inventory
+    // Will attempt to fill existing item stacks first
+    // Returns true only when ALL of the items are successfully stored
+    public bool TryStore(SimpleCommodity item)
+    {
+        TryFindSpace(item, out var positions);
+        foreach (var position in positions)
+        {
+            if (TryStore(item, position)) return true;
+        }
+
+        return false;
+    }
+
+    // Try to store the given commodity at the given position
+    // If there's a stack at the given position it will be added to
+    // Returns true only when ALL of the items are successfully stored
+    public bool TryStore(SimpleCommodity item, int2 cargoCoord)
+    {
+        var itemData = _itemManager.GetData(item);
+        if (ItemFits(item, cargoCoord))
+        {
+            foreach (var p in itemData.Shape.Coordinates)
+            {
+                var pos = cargoCoord + itemData.Shape.Rotate(p, item.Rotation);
+                Occupancy[pos.x, pos.y] = item;
+            }
+            Cargo[item] = cargoCoord;
+            
+            if(!ItemsOfType.ContainsKey(item.Data))
+                ItemsOfType[item.Data] = new List<ItemInstance>();
+            ItemsOfType[item.Data].Add(item);
+        }
+        else if (Occupancy[cargoCoord.x, cargoCoord.y] is SimpleCommodity cargoCommodity && cargoCommodity.Data == item.Data)
+        {
+            if (cargoCommodity.Quantity + item.Quantity <= itemData.MaxStack)
+            {
+                cargoCommodity.Quantity += item.Quantity;
+            }
+            else
+            {
+                var quantityTransferred = itemData.MaxStack - cargoCommodity.Quantity;
+                item.Quantity -= quantityTransferred;
+                cargoCommodity.Quantity = itemData.MaxStack;
+                
+                Mass += itemData.Mass * quantityTransferred;
+                ThermalMass += itemData.Mass * itemData.SpecificHeat * quantityTransferred;
+                return false;
+            }
+        }
+        else return false;
+        
+        Mass += _itemManager.GetMass(item);
+        ThermalMass += _itemManager.GetThermalMass(item);
+        return true;
+    }
+
+    // Searches the cargo bay for a position where the item will fit, returns true when found
+    public bool TryFindSpace(CraftedItemInstance item, out int2 position)
+    {
+        // Search all the space in the cargo bay for an empty space where the item fits
+        foreach (var cargoCoord in _cargoData.InteriorShape.Coordinates)
+        {
+            if (ItemFits(item, cargoCoord))
+            {
+                position = cargoCoord;
+                return true;
+            }
+        }
+
+        position = int2.zero;
+        return false;
+    }
+
+    // Try to store the given item anywhere it will fit, returns true when the item was successfully stored
+    public bool TryStore(CraftedItemInstance item) => TryFindSpace(item, out var position) && TryStore(item, position);
+
+    // Try to store the given item at the given position, returns true when the item was successfully stored
+    public bool TryStore(CraftedItemInstance item, int2 cargoCoord)
+    {
+        if (!ItemFits(item, cargoCoord)) return false;
+        
+        var itemData = _itemManager.GetData(item);
+        foreach (var p in itemData.Shape.Coordinates)
+        {
+            var pos = cargoCoord + itemData.Shape.Rotate(p, item.Rotation);
+            Occupancy[pos.x, pos.y] = item;
+        }
+        Cargo[item] = cargoCoord;
+        
+        if(!ItemsOfType.ContainsKey(item.Data))
+            ItemsOfType[item.Data] = new List<ItemInstance>();
+        ItemsOfType[item.Data].Add(item);
+        
+        Mass += _itemManager.GetMass(item);
+        ThermalMass += _itemManager.GetThermalMass(item);
+
+        return true;
+    }
+
+    public SimpleCommodity Remove(SimpleCommodity item, int quantity)
+    {
+        if (!Cargo.ContainsKey(item))
+        {
+            _itemManager.Log("Attempted to remove item from a cargo bay that it wasn't even in! Something went wrong here!");
+            return null;
+        }
+        var itemData = _itemManager.GetData(item);
+        if(quantity >= item.Quantity)
+        {
+            foreach (var pos in itemData.Shape.Coordinates.Select(p => Cargo[item] + itemData.Shape.Rotate(p, item.Rotation)))
+                Occupancy[pos.x, pos.y] = null;
+
+            Cargo.Remove(item);
+            ItemsOfType[item.Data].Remove(item);
+            if (!ItemsOfType[item.Data].Any())
+                ItemsOfType.Remove(item.Data);
+
+            Mass -= _itemManager.GetMass(item);
+            ThermalMass -= _itemManager.GetThermalMass(item);
+
+            return item;
+        }
+
+        item.Quantity -= quantity;
+        Mass -= itemData.Mass * quantity;
+        ThermalMass -= itemData.Mass * itemData.SpecificHeat * quantity;
+        return new SimpleCommodity{Data = item.Data, Quantity = quantity, Rotation = item.Rotation};
+    }
+
+    public void Remove(CraftedItemInstance item)
+    {
+        if (!Cargo.ContainsKey(item))
+        {
+            _itemManager.Log("Attempted to remove item from a cargo bay that it wasn't even in! Something went wrong here!");
+            return;
+        }
+        var itemData = _itemManager.GetData(item);
+        foreach (var pos in itemData.Shape.Coordinates.Select(p => Cargo[item] + itemData.Shape.Rotate(p, item.Rotation)))
+            Occupancy[pos.x, pos.y] = null;
+        
+        Cargo.Remove(item);
+        ItemsOfType[item.Data].Remove(item);
+        if (!ItemsOfType[item.Data].Any())
+            ItemsOfType.Remove(item.Data);
+        
+        Mass -= _itemManager.GetMass(item);
+        ThermalMass -= _itemManager.GetThermalMass(item);
+    }
+    
+    public bool TryTransferItem(EquippedCargoBay target, SimpleCommodity item, int quantity)
+    {
+        if (!Cargo.ContainsKey(item))
+        {
+            _itemManager.Log("Attempted to remove item from a cargo bay that it wasn't even in! Something went wrong here!");
+            return false;
+        }
+
+        var oldPos = Cargo[item];
+        var newItem = Remove(item, quantity);
+        
+        if (target.TryStore(item)) return true;
+        
+        // Failed to transfer full quantity, move the remaining items back to their old slot
+        TryStore(newItem, oldPos);
+        return false;
+    }
+    
+    public bool TryTransferItem(EquippedCargoBay target, CraftedItemInstance item)
+    {
+        if (!Cargo.ContainsKey(item))
+        {
+            _itemManager.Log("Attempted to remove item from a cargo bay that it wasn't even in! Something went wrong here!");
+            return false;
+        }
+        
+        if (!target.TryStore(item)) return false;
+        Remove(item);
+        return true;
+    }
 }
 
 public class BehaviorGroup
diff --git a/Assets/Scripts/ServerShared/Enums.cs b/Assets/Scripts/ServerShared/Enums.cs
index d5257db15..84231b16f 100644
--- a/Assets/Scripts/ServerShared/Enums.cs
+++ b/Assets/Scripts/ServerShared/Enums.cs
@@ -10,6 +10,7 @@ public enum LauncherCaliber
 public enum HardpointType
 {
     Hull,
+    Thermal,
     Thruster,
     WarpThruster,
     Reactor,
diff --git a/Assets/Scripts/ServerShared/Extensions.cs b/Assets/Scripts/ServerShared/Extensions.cs
index 86a1e70c3..46974ee7b 100644
--- a/Assets/Scripts/ServerShared/Extensions.cs
+++ b/Assets/Scripts/ServerShared/Extensions.cs
@@ -29,12 +29,12 @@ public static class Extensions
         peer.Send(MessagePackSerializer.Serialize(message as Message), method);
     }
 
-    public static float Performance(this EquippableItemData itemData, float temperature)
-    {
-        return saturate(itemData.HeatPerformanceCurve.Evaluate(saturate(
-            (temperature - itemData.MinimumTemperature) /
-            (itemData.MaximumTemperature - itemData.MinimumTemperature))));
-    }
+    // public static float Performance(this EquippableItemData itemData, float temperature)
+    // {
+    //     return saturate(itemData.HeatPerformanceCurve.Evaluate(saturate(
+    //         (temperature - itemData.MinimumTemperature) /
+    //         (itemData.MaximumTemperature - itemData.MinimumTemperature))));
+    // }
 	
     public static string SplitCamelCase( this string str )
     {
diff --git a/Assets/Scripts/ServerShared/GlobalData.cs b/Assets/Scripts/ServerShared/GlobalData.cs
index dffe9ed28..8eca78229 100644
--- a/Assets/Scripts/ServerShared/GlobalData.cs
+++ b/Assets/Scripts/ServerShared/GlobalData.cs
@@ -8,162 +8,6 @@ using static Unity.Mathematics.math;
 using static Unity.Mathematics.noise;
 using static NoiseFbm;
 
-[Inspectable, Serializable, RethinkTable("Galaxy"), MessagePackObject, JsonObject(MemberSerialization.OptIn)]
-public class GlobalData : DatabaseEntry
-{
-    [InspectableField, JsonProperty("galaxyName"), Key(1)]  
-    public string GalaxyName;
-
-    [InspectableDatabaseLink(typeof(ZoneData)), JsonProperty("arrivalZone"), Key(2)]  
-    public Guid ArrivalZone;
-
-    [InspectableField, JsonProperty("galaxyArms"), Key(4)]  
-    public int Arms = 4;
-
-    [InspectableField, JsonProperty("galaxyTwist"), Key(5)]  
-    public float Twist = 10;
-
-    [InspectableField, JsonProperty("galaxyTwistPower"), Key(6)]  
-    public float TwistPower = 2;
-
-    [InspectableField, JsonProperty("radiusPower"), Key(7)]  
-    public float RadiusPower = 1.75f;
-
-    [InspectableField, JsonProperty("massFloor"), Key(8)]
-    public float MassFloor = 1;
-
-    [InspectableField, JsonProperty("sunMass"), Key(9)]  
-    public float SunMass = 10000;
-
-    [InspectableField, JsonProperty("gasGiantMass"), Key(10)]  
-    public float GasGiantMass = 2000;
-
-    [InspectableField, JsonProperty("planetMass"), Key(11)]  
-    public float PlanetMass = 100f;
-
-    [InspectableField, JsonProperty("satelliteCreationMassFloor"), Key(12)]  
-    public float SatelliteCreationMassFloor = 100;
-
-    [InspectableField, JsonProperty("satelliteCreationProbability"), Key(13)]  
-    public float SatelliteCreationProbability = .25f;
-
-    [InspectableField, JsonProperty("binaryCreationProbability"), Key(14)]  
-    public float BinaryCreationProbability = .25f;
-
-    [InspectableField, JsonProperty("rosetteProbability"), Key(15)]  
-    public float RosetteProbability = .25f;
-    
-    // [InspectableField] [JsonProperty("mapLayers")] [Key(16)]
-    // public Dictionary<string, Guid> MapLayers = new Dictionary<string, Guid>();
-
-    [InspectableField, JsonProperty("zoneRadiusMin"), Key(16)]  
-    public float MinimumZoneRadius = 500;
-
-    [InspectableField, JsonProperty("zoneRadiusMax"), Key(17)]  
-    public float MaximumZoneRadius = 2000;
-
-    [InspectableField, JsonProperty("zoneRadiusExp"), Key(18)]  
-    public float ZoneRadiusExponent = -.75f;
-
-    [InspectableField, JsonProperty("zoneMassMin"), Key(19)]  
-    public float MinimumZoneMass = 10000;
-
-    [InspectableField, JsonProperty("zoneMassMax"), Key(20)]  
-    public float MaximumZoneMass = 100000;
-
-    [InspectableField, JsonProperty("zoneMassExp"), Key(21)]  
-    public float ZoneMassExponent = -.75f;
-
-    [InspectableField, JsonProperty("orbitPeriodExponent"), Key(22)]  
-    public float OrbitPeriodExponent = 1.5f;
-
-    [InspectableField, JsonProperty("orbitPeriodMultiplier"), Key(23)]  
-    public float OrbitPeriodMultiplier = 1f;
-
-    [InspectableField, JsonProperty("beltProbability"), Key(26)]  
-    public float BeltProbability = .05f;
-
-    [InspectableField, JsonProperty("beltMassCeiling"), Key(27)]  
-    public float BeltMassCeiling = 500f;
-
-    [InspectableField, JsonProperty("beltMassRatio"), Key(28)]  
-    public float BeltMassRatio = 100f;
-
-    [InspectableField, JsonProperty("beltMassExponent"), Key(29)]  
-    public float BeltMassExponent = 100f;
-
-    [InspectableField, JsonProperty("asteroidSizeMin"), Key(30)]
-    public float AsteroidSizeMin = 2f;
-
-    [InspectableField, JsonProperty("asteroidSizeMax"), Key(31)]
-    public float AsteroidSizeMax = 10f;
-
-    [InspectableField, JsonProperty("asteroidSizeExponent"), Key(32)]
-    public float AsteroidSizeExponent = 2f;
-
-    [InspectableField, JsonProperty("asteroidRotationSpeed"), Key(33)]
-    public float AsteroidRotationSpeed = 2f;
-
-    [InspectableField, JsonProperty("dockingDistance"), Key(34)]
-    public float DockingDistance = 25;
-
-    [InspectableField, JsonProperty("warpDistance"), Key(35)]
-    public float WarpDistance = 25;
-    
-    [InspectableField, JsonProperty("targetPersistenceDuration"), Key(37)]  
-    public float TargetPersistenceDuration = 3;
-
-    [InspectableField, JsonProperty("heatRadiationPower"), Key(38)]  
-    public float HeatRadiationPower = 1;
-
-    [InspectableField, JsonProperty("heatRadiationMultiplier"), Key(39)]  
-    public float HeatRadiationMultiplier = 1;
-
-    [InspectableField, JsonProperty("resourceDensityMinimum"), Key(40)]  
-    public float ResourceDensityMinimum = .1f;
-
-    [InspectableField, JsonProperty("resourceDensityMaximum"), Key(41)]  
-    public float ResourceDensityMaximum = 1.5f;
-
-    [InspectableField, JsonProperty("startingGearQualityMin"), Key(42)]
-    public float StartingGearQualityMin = .1f;
-
-    [InspectableField, JsonProperty("startingGearQualityMax"), Key(43)]  
-    public float StartingGearQualityMax = .5f;
-
-    [InspectableField, JsonProperty("asteroidHitpointsMin"), Key(44)]  
-    public float AsteroidHitpointsMin = 10f;
-
-    [InspectableField, JsonProperty("asteroidHitpointsMax"), Key(45)]  
-    public float AsteroidHitpointsMax = 200f;
-
-    [InspectableField, JsonProperty("asteroidHitpointsPower"), Key(46)]  
-    public float AsteroidHitpointsPower = 2f;
-
-    [InspectableField, JsonProperty("asteroidRespawnMin"), Key(47)]  
-    public float AsteroidRespawnMin = 10f;
-
-    [InspectableField, JsonProperty("asteroidRespawnMax"), Key(48)]  
-    public float AsteroidRespawnMax = 100f;
-
-    [InspectableField, JsonProperty("miningDifficulty"), Key(49)]  
-    public float MiningDifficulty = 500f;
-
-    [InspectableField, JsonProperty("messageDuration"), Key(50)]  
-    public float MessageDuration = 4f;
-
-    [InspectableField, JsonProperty("significantDigits"), Key(51)]
-    public int SignificantDigits = 3;
-
-    [InspectableField, JsonProperty("productionPersonalityLerp"), Key(52)]
-    public float ProductionPersonalityLerp = .05f;
-    
-    public float PlanetRadius(float mass)
-    {
-        return pow(mass, 1 / RadiusPower);
-    }
-}
-
 [Inspectable, Serializable, RethinkTable("Galaxy"), MessagePackObject, JsonObject(MemberSerialization.OptIn)]
 public class GalaxyMapLayerData : DatabaseEntry, INamedEntry
 {
diff --git a/Assets/Scripts/ServerShared/IChangeSource.cs b/Assets/Scripts/ServerShared/IChangeSource.cs
deleted file mode 100644
index 18940a185..000000000
--- a/Assets/Scripts/ServerShared/IChangeSource.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-
-public interface IChangeSource  
-{  
-    event Action OnChanged;  
-}  
diff --git a/Assets/Scripts/ServerShared/ItemData.cs b/Assets/Scripts/ServerShared/ItemData.cs
index 257317233..ce7d7013a 100644
--- a/Assets/Scripts/ServerShared/ItemData.cs
+++ b/Assets/Scripts/ServerShared/ItemData.cs
@@ -1,10 +1,93 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using JsonKnownTypes;
 using MessagePack;
 using Newtonsoft.Json;
 using Unity.Mathematics;
+using static Unity.Mathematics.math;
+using int2 = Unity.Mathematics.int2;
+
+public class Shape
+{
+    [JsonProperty("name"), Key(0)] public bool[,] Cells;
+    
+    private bool _dirty = true;
+
+    public Shape(int width, int height)
+    {
+        Cells = new bool[width, height];
+    }
+    
+    public int Width => Cells.GetLength(0);
+
+    public int Height => Cells.GetLength(1);
+
+    private static int mod(int x, int m) {
+        int r = x%m;
+        return r<0 ? r+m : r;
+    }
+    
+    public int2 Rotate(int2 position, int rotation)
+    {
+        switch (mod(rotation, 4))
+        {
+            case 1:
+                return int2(position.y, Width - 1 - position.x);
+            case 2:
+                return int2(Width - 1 - position.x, Height - 1 - position.y);
+            case 3:
+                return int2(Height - 1 - position.y, position.x);
+            default:
+                return int2(position.x, position.y);
+        }
+    }
+
+    private int2[] _cachedShapeCoordinates;
+    
+    [IgnoreMember]
+    public int2[] Coordinates
+    {
+        get
+        {
+            if (_dirty) _cachedShapeCoordinates = EnumerateShapeCoordinates().ToArray();
+            return _cachedShapeCoordinates;
+        }
+    }
+
+    private IEnumerable<int2> EnumerateShapeCoordinates()
+    {
+        for(int x = 0; x < Cells.GetLength(0); x++)
+        {
+            for (int y = 0; y < Cells.GetLength(0); y++)
+            {
+                if(Cells[x,y]) yield return int2(x, y);
+            }
+        }
+    }
+
+    public bool this[int2 pos] {
+        get { return pos.x >= 0 && pos.y >= 0 && pos.x < Cells.GetLength(0) && pos.y < Cells.GetLength(1) && Cells[pos.x, pos.y]; }
+        set
+        {
+            _dirty = true;
+            Cells[pos.x, pos.y] = value;
+        }
+    }
+
+    public Shape Shrink()
+    {
+        var shape = new Shape(Width, Height);
+        foreach(var shapeCoord in Coordinates)
+            shape[shapeCoord] = (
+                this[shapeCoord + int2(-1,-1)] && this[shapeCoord + int2(0,-1)] && this[shapeCoord + int2(1,-1)] &&
+                this[shapeCoord + int2(-1,0)] && this[shapeCoord + int2(1,0)] && 
+                this[shapeCoord + int2(-1,1)] && this[shapeCoord + int2(0,1)] && this[shapeCoord + int2(1,1)]
+            );
+        return shape;
+    }
+}
 
 [MessagePackObject, 
  Union(0, typeof(SimpleCommodityData)), 
@@ -23,8 +106,8 @@ public abstract class ItemData : DatabaseEntry, INamedEntry
     [InspectableField, JsonProperty("mass"), Key(3)]
     public float Mass;
 
-    [InspectableField, JsonProperty("size"), Key(4)]
-    public float Size;
+    [InspectableField, JsonProperty("shape"), Key(4)]
+    public Shape Shape;
 
     // Heat needed to change temperature of 1 gram by 1 degree
     [InspectableField, JsonProperty("specificHeat"), Key(5)]
@@ -35,36 +118,32 @@ public abstract class ItemData : DatabaseEntry, INamedEntry
         get => Name;
         set => Name = value;
     }
+
 }
 
 [RethinkTable("Items"), Inspectable, MessagePackObject]
 public class SimpleCommodityData : ItemData
 {
-    // Types of body where this resource can be found
-    [InspectableField, JsonProperty("resourceBodyType"), Key(6)]  
-    public BodyType ResourceBodyType;
+    // // Types of body where this resource can be found
+    // [InspectableField, JsonProperty("resourceBodyType"), Key(6)]  
+    // public BodyType ResourceBodyType;
+    //
+    // // Link to map(s) controlling density of resource, multiplied together when more than one
+    // [InspectableDatabaseLink(typeof(GalaxyMapLayerData)), JsonProperty("resourceDensity"), Key(7)]  
+    // public List<Guid> ResourceDensity = new List<Guid>();
+    //
+    // // Controls the lowest value in the resource distribution curve
+    // [InspectableField, JsonProperty("distribution"), Key(8)]
+    // public ExponentialLerp Distribution;
+    //
+    // // Minimum amount of resources needed for presence to register
+    // [InspectableField, JsonProperty("floor"), Key(11)]
+    // public float Floor = 5f;
 
-    // Link to map(s) controlling density of resource, multiplied together when more than one
-    [InspectableDatabaseLink(typeof(GalaxyMapLayerData)), JsonProperty("resourceDensity"), Key(7)]  
-    public List<Guid> ResourceDensity = new List<Guid>();
+    [InspectableField, JsonProperty("maxStackSize"), Key(6)]
+    public int MaxStack;
 
-    // Controls the lowest value in the resource distribution curve
-    [InspectableField, JsonProperty("minimum"), Key(8)]
-    public float Minimum = 1;
-
-    // Controls the highest value in the resource distribution curve
-    [InspectableField, JsonProperty("maximum"), Key(9)]
-    public float Maximum = 100;
-
-    // Controls the shape of the resource distribution curve
-    [InspectableField, JsonProperty("exponent"), Key(10)]
-    public float Exponent = -.75f;
-
-    // Minimum amount of resources needed for presence to register
-    [InspectableField, JsonProperty("floor"), Key(11)]
-    public float Floor = 5f;
-
-    [InspectableField, JsonProperty("category"), Key(12)]  
+    [InspectableField, JsonProperty("category"), Key(7)]  
     public SimpleCommodityCategory Category;
 }
 
@@ -83,10 +162,10 @@ public abstract class CraftedItemData : ItemData
 [RethinkTable("Items"), Inspectable, MessagePackObject]
 public class CompoundCommodityData : CraftedItemData
 {
-    [InspectableDatabaseLink(typeof(PersonalityAttribute)), JsonProperty("demandProfile"), Key(7)]  
+    [InspectableDatabaseLink(typeof(PersonalityAttribute)), JsonProperty("demandProfile"), Key(7)]
     public Dictionary<Guid, float> DemandProfile = new Dictionary<Guid, float>();
 
-    [InspectableField, JsonProperty("category"), Key(8)]  
+    [InspectableField, JsonProperty("category"), Key(8)] 
     public CompoundCommodityCategory Category;
 }
 
@@ -95,26 +174,20 @@ public class CompoundCommodityData : CraftedItemData
  JsonObject(MemberSerialization.OptIn), JsonConverter(typeof(JsonKnownTypesConverter<EquippableItemData>))]
 public abstract class EquippableItemData : CraftedItemData
 {
-    [InspectableAnimationCurve, JsonProperty("performanceCurve"), Key(7)]
-    public float4[] HeatPerformanceCurve;
+    [InspectableField, JsonProperty("behaviors"), Key(7)]  
+    public List<BehaviorData> Behaviors = new List<BehaviorData>();
 
-    [TemperatureInspectable, JsonProperty("minTemp"), Key(8)]
+    [InspectableField, JsonProperty("durability"), Key(8)]
+    public float Durability;
+    
+    [TemperatureInspectable, JsonProperty("minTemp"), Key(9)]
     public float MinimumTemperature;
 
-    [TemperatureInspectable, JsonProperty("maxTemp"), Key(9)]
+    [TemperatureInspectable, JsonProperty("maxTemp"), Key(10)]
     public float MaximumTemperature;
 
-    [InspectableField, JsonProperty("durabilityStat"), Key(10), SimplePerformanceStat]
-    public PerformanceStat Durability = new PerformanceStat();
-
     [InspectableField, JsonProperty("durabilityExponent"), Key(11), SimplePerformanceStat]
     public PerformanceStat DurabilityExponent = new PerformanceStat();
-
-    [InspectableField, JsonProperty("heatExponent"), Key(12), SimplePerformanceStat]
-    public PerformanceStat HeatExponent = new PerformanceStat();
-
-    [InspectableField, JsonProperty("behaviors"), Key(13)]  
-    public List<BehaviorData> Behaviors = new List<BehaviorData>();
     
     [IgnoreMember]
     public abstract HardpointType HardpointType { get; }
@@ -122,63 +195,63 @@ public abstract class EquippableItemData : CraftedItemData
     [IgnoreMember] private const int STEPS = 64;
 
     [IgnoreMember] private float? _optimum;
-    [IgnoreMember]
-    public float OptimalTemperature
-    {
-        get
-        {
-            if (_optimum==null)
-            {
-                var samples = Enumerable.Range(0, STEPS).Select(i => (float) i / STEPS).ToArray();
-                float max = 0;
-                _optimum = 0;
-                foreach (var f in samples)
-                {
-                    var p = HeatPerformanceCurve?.Evaluate(f)??0;
-                    if (p > max)
-                    {
-                        max = p;
-                        _optimum = f;
-                    }
-                }
-            }
-
-            return (float) (MinimumTemperature + _optimum * (MaximumTemperature - MinimumTemperature));
-        }
-    }
 }
 
 [RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
 public class GearData : EquippableItemData
 {
-    [InspectableField, JsonProperty("hardpointType"), Key(14)]
+    [InspectableField, JsonProperty("hardpointType"), Key(12)]
     public HardpointType Hardpoint;
 
     [IgnoreMember] public override HardpointType HardpointType => Hardpoint;
 }
 
+[RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
+public class CargoBayData : EquippableItemData
+{
+    [InspectableField, JsonProperty("interiorShape"), Key(12)]
+    public Shape InteriorShape;
+    [IgnoreMember] public override HardpointType HardpointType => HardpointType.Tool;
+}
+
 [RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
 public class HullData : EquippableItemData
 {
-    [InspectableField, JsonProperty("hullCapacity"), Key(14)]  
-    public PerformanceStat Capacity = new PerformanceStat();
-
-    [InspectableField, JsonProperty("hardpoints"), Key(15)]  
+    [InspectableField, JsonProperty("hardpoints"), Key(12)]  
     public List<HardpointData> Hardpoints = new List<HardpointData>();
 
-    [InspectablePrefab, JsonProperty("prefab"), Key(16)]  
+    [InspectablePrefab, JsonProperty("prefab"), Key(13)]  
     public string Prefab;
 
-    [InspectableField, JsonProperty("hullType"), Key(17)]
+    [InspectableField, JsonProperty("hullType"), Key(14)]
     public HullType HullType;
 
+    [IgnoreMember]
+    public Shape InteriorCells
+    {
+        get
+        {
+            if (_interiorCells == null)
+            {
+                _interiorCells = Shape.Shrink();
+            }
+
+            return _interiorCells;
+        }
+    }
+
+    private Shape _interiorCells;
+
     [IgnoreMember] public override HardpointType HardpointType => HardpointType.Hull;
 }
 
-[RethinkTable("Items"), InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
+[InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
 public class HardpointData
 {
-    [InspectableField, JsonProperty("type"), Key(0)]  public HardpointType Type;
+    [InspectableField, JsonProperty("type"), Key(0)] public HardpointType Type;
+    [InspectableField, JsonProperty("position"), Key(1)] public int2 Position;
+    [InspectableField, JsonProperty("shape"), Key(2)] public Shape Shape;
+    [InspectableField, JsonProperty("transform"), Key(3)] public string Transform;
 }
 
 [MessagePackObject, JsonObject(MemberSerialization.OptIn)]
@@ -191,10 +264,10 @@ public class PerformanceStat
     [JsonProperty("durabilityDependent"), Key(2)] 
     public bool DurabilityDependent;
 
-    [JsonProperty("heatDependent"), Key(3)] 
-    public bool HeatDependent;
+    // [JsonProperty("heatDependent"), Key(3)] 
+    // public bool HeatDependent;
 
-    [JsonProperty("qualityExponent"), Key(4)] 
+    [JsonProperty("qualityExponent"), Key(3)] 
     public float QualityExponent;
     
     //[JsonProperty("id"), Key(5)]  public Guid ID = Guid.NewGuid();
@@ -206,11 +279,11 @@ public class PerformanceStat
 
     [IgnoreMember]
     private Dictionary<Entity, Dictionary<IBehavior, float>> ScaleModifiers =>
-        _scaleModifiers ?? (_scaleModifiers = new Dictionary<Entity, Dictionary<IBehavior, float>>());
+        _scaleModifiers = _scaleModifiers ?? new Dictionary<Entity, Dictionary<IBehavior, float>>();
 
     [IgnoreMember]
     private Dictionary<Entity, Dictionary<IBehavior, float>> ConstantModifiers =>
-        _constantModifiers ?? (_constantModifiers = new Dictionary<Entity, Dictionary<IBehavior, float>>());
+        _constantModifiers = _constantModifiers ?? new Dictionary<Entity, Dictionary<IBehavior, float>>();
 
     public Dictionary<IBehavior, float> GetScaleModifiers(Entity entity)
     {
diff --git a/Assets/Scripts/ServerShared/ItemInstance.cs b/Assets/Scripts/ServerShared/ItemInstance.cs
index c967fd939..15a9c1eb5 100644
--- a/Assets/Scripts/ServerShared/ItemInstance.cs
+++ b/Assets/Scripts/ServerShared/ItemInstance.cs
@@ -9,32 +9,28 @@ using MessagePack;
 using MessagePack.Formatters;
 using Newtonsoft.Json;
 using Unity.Mathematics;
-// TODO: USE THIS EVERYWHERE
 using static Unity.Mathematics.math;
 
 [Union(0, typeof(SimpleCommodity)), 
  Union(1, typeof(CompoundCommodity)), 
- Union(2, typeof(Gear)),
+ Union(2, typeof(EquippableItem)),
  JsonObject(MemberSerialization.OptIn), 
  JsonConverter(typeof(JsonKnownTypesConverter<ItemInstance>))]
-public abstract class ItemInstance : DatabaseEntry
+public abstract class ItemInstance
 {
-    [JsonProperty("data"), Key(1)]  public Guid Data;
-
-    public float Mass => Context.GetMass(this);
-    public float ThermalMass => Context.GetThermalMass(this);
-    public float Size => Context.GetSize(this);
+    [JsonProperty("data"), Key(0)] public Guid Data;
+    [JsonProperty("rotation"), Key(1)] public int Rotation;
 }
 
 [Union(0, typeof(CompoundCommodity)), 
- Union(1, typeof(Gear)), 
+ Union(1, typeof(EquippableItem)), 
  JsonObject(MemberSerialization.OptIn),
  JsonConverter(typeof(JsonKnownTypesConverter<CraftedItemInstance>))]
 public abstract class CraftedItemInstance : ItemInstance
 {
     [JsonProperty("quality"), Key(2)]  public float Quality;
 
-    [JsonProperty("ingredients"), Key(3)]  public List<Guid> Ingredients = new List<Guid>();
+    [JsonProperty("ingredients"), Key(3)]  public List<ItemInstance> Ingredients = new List<ItemInstance>();
     
     [JsonProperty("blueprint"), Key(4)]  public Guid Blueprint;
     
@@ -44,27 +40,16 @@ public abstract class CraftedItemInstance : ItemInstance
 }
 
 [MessagePackObject, JsonObject(MemberSerialization.OptIn)]
-public class CompoundCommodity : CraftedItemInstance {}
+public class CompoundCommodity : CraftedItemInstance { }
 
 [MessagePackObject, JsonObject(MemberSerialization.OptIn)]
 public class SimpleCommodity : ItemInstance
 {
     [JsonProperty("quantity"), Key(2)]  public int Quantity;
-
-    public SimpleCommodityData ItemData => Context.GetData(this);
 }
 
 [MessagePackObject, JsonObject(MemberSerialization.OptIn)]
-public class Gear : CraftedItemInstance, IChangeSource
+public class EquippableItem : CraftedItemInstance
 {
     [JsonProperty("durability"), Key(7)]  public float Durability;
-
-    public EquippableItemData ItemData => Context.GetData(this);
-    
-    public event Action OnChanged;
-
-    public void Change()
-    {
-        OnChanged?.Invoke();
-    }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/GameContext.cs b/Assets/Scripts/ServerShared/ItemManager.cs
similarity index 51%
rename from Assets/Scripts/ServerShared/GameContext.cs
rename to Assets/Scripts/ServerShared/ItemManager.cs
index 23ba861fd..220254473 100644
--- a/Assets/Scripts/ServerShared/GameContext.cs
+++ b/Assets/Scripts/ServerShared/ItemManager.cs
@@ -10,13 +10,13 @@ using JM.LinqFaster;
 using UniRx;
 using float4 = Unity.Mathematics.float4;
 
-public class GameContext
+public class ItemManager
 {
     public Random Random = new Random((uint) (DateTime.Now.Ticks%uint.MaxValue));
-    public Dictionary<string, GalaxyMapLayerData> MapLayers = new Dictionary<string, GalaxyMapLayerData>();
-    public SimpleCommodityData[] Resources;
-    public Dictionary<Guid, List<IController>> CorporationControllers = new Dictionary<Guid, List<IController>>();
-    public Dictionary<Guid, ZoneDefinition> GalaxyZones;
+    // public Dictionary<string, GalaxyMapLayerData> MapLayers = new Dictionary<string, GalaxyMapLayerData>();
+    // public SimpleCommodityData[] Resources;
+    // public Dictionary<Guid, List<IController>> CorporationControllers = new Dictionary<Guid, List<IController>>();
+    // public Dictionary<Guid, ZoneDefinition> GalaxyZones;
     
     private Action<string> _logger;
 
@@ -25,25 +25,12 @@ public class GameContext
 
     private double _time;
     private float _deltaTime;
-    private GlobalData _globalData;
     private Dictionary<Guid, Zone> _zones = new Dictionary<Guid, Zone>();
     // private Guid _forceLoadZone;
     
-    public GlobalData GlobalData => _globalData ?? (_globalData = Cache.GetAll<GlobalData>().FirstOrDefault());
-    public DatabaseCache Cache { get; }
-
-    // public Guid ForceLoadZone
-    // {
-    //     get => _forceLoadZone;
-    //     set
-    //     {
-    //         if(_forceLoadZone != Guid.Empty && ZoneEntities[_forceLoadZone].Count == 0)
-    //             UnloadZone(_forceLoadZone);
-    //         _forceLoadZone = value;
-    //         if(!_loadedZones.Contains(_forceLoadZone))
-    //             LoadZone(_forceLoadZone);
-    //     }
-    // }
+    // public GlobalData GlobalData => _globalData ?? (_globalData = ItemData.GetAll<GlobalData>().FirstOrDefault());
+    public DatabaseCache ItemData { get; }
+    public GameplaySettings GameplaySettings { get; }
 
     public double Time
     {
@@ -58,18 +45,10 @@ public class GameContext
 
     // private readonly Dictionary<CraftedItemData, int> Tier = new Dictionary<CraftedItemData, int>();
 
-    public GameContext(DatabaseCache cache, Action<string> logger)
+    public ItemManager(DatabaseCache itemData, GameplaySettings settings, Action<string> logger)
     {
-        Cache = cache;
-        MapLayers = cache.GetAll<GalaxyMapLayerData>().ToDictionary(ml => ml.Name);
-        Resources = cache.GetAll<SimpleCommodityData>().Where(i => i.ResourceDensity.Any()).ToArray();
+        ItemData = itemData;
         _logger = logger;
-        // var globalData = Cache.GetAll<GlobalData>().FirstOrDefault();
-        // if (globalData == null)
-        // {
-        //     globalData = new GlobalData();
-        //     Cache.Add(globalData);
-        // }
     }
 
     public void Log(string s)
@@ -116,137 +95,6 @@ public class GameContext
     //     
     // }
 
-    // public Zone GetZone(Guid zone)
-    // {
-    //     if (_zones.ContainsKey(zone)) return _zones[zone];
-    //     
-    //     // var zoneData = Cache.Get<ZoneData>(zone);
-    //     // if (zoneData == null) throw new ArgumentException("Zone parameter is not a valid zone ID!", nameof(zone));
-    //     //
-    //     // return GetZone(zoneData);
-    //     return null;
-    // }
-    //
-    // public Zone GetZone(ZonePack zonePack)
-    // {
-    //     var z = new Zone(this, zonePack);
-    //     _zones.Add(zonePack.Data.ID, z);
-    //     return z;
-    // }
-    //
-    // public void UnloadZone(Guid zone)
-    // {
-    //     _zones.Remove(zone);
-    // }
-
-    // public void Warp(Entity entity, Guid targetZone)
-    // {
-    //     if (length(entity.Position - WormholePosition(entity.Zone, targetZone)) < GlobalData.WarpDistance)
-    //     {
-    //         var sourceZone = entity.Zone;
-    //         
-    //         // Remove entity from source zone
-    //         ZoneEntities[sourceZone].Remove(entity.ID);
-    //         
-    //         // Unload source zone if empty and unobserved
-    //         if(ForceLoadZone != sourceZone && ZoneEntities[sourceZone].Count == 0)
-    //             UnloadZone(sourceZone);
-    //         
-    //         // Load target zone if not yet loaded
-    //         if(!_loadedZones.Contains(targetZone))
-    //             LoadZone(targetZone);
-    //         
-    //         entity.Zone = targetZone;
-    //         entity.Position = WormholePosition(targetZone, sourceZone);
-    //         ZoneEntities[targetZone][entity.ID] = entity;
-    //     }
-    // }
-
-    public void PlaceMegas()
-    {
-        var megas = Cache.GetAll<MegaCorporation>();
-        
-        var availableZones = Cache.GetAll<ZoneData>()
-            .Where(z => megas.All(m => m.HomeZone != z.ID))
-            .ToList();
-        
-        foreach(var megaPlacement in megas
-            .OrderBy(m=>m.PlacementType)
-            .GroupBy(m=>m.PlacementType))
-            switch (megaPlacement.Key)
-            {
-                case MegaPlacementType.Mass:
-                    foreach (var mega in megaPlacement)
-                    {
-                        var zone = availableZones
-                            .MaxBy(z => z.Mass);
-                        availableZones.Remove(zone);
-                        mega.HomeZone = zone.ID;
-                    }
-                    break;
-                // case MegaPlacementType.Planets:
-                //     foreach (var mega in megaPlacement)
-                //     {
-                //         var zone = availableZones
-                //             .MaxBy(z => z.Planets.Length);
-                //         availableZones.Remove(zone);
-                //         mega.HomeZone = zone.ID;
-                //     }
-                //     break;
-                // case MegaPlacementType.Resources:
-                //     foreach (var mega in megaPlacement)
-                //     {
-                //         var zone = availableZones
-                //             .MaxBy(z => z.Planets
-                //                 .SelectMany(id=>Cache.Get<PlanetData>(id).Resources
-                //                     .Select(r=>r.Key))
-                //                 .Distinct()
-                //                 .Count());
-                //         availableZones.Remove(zone);
-                //         mega.HomeZone = zone.ID;
-                //     }
-                //     break;
-                case MegaPlacementType.Connected:
-                    foreach (var mega in megaPlacement)
-                    {
-                        var zone = availableZones
-                            .OrderByDescending(z => z.Wormholes.Count)
-                            .ThenBy(z=>megas
-                                .Sum(m=>m.HomeZone==Guid.Empty?0:lengthsq(Cache.Get<ZoneData>(m.HomeZone).Position - z.Position)))
-                            .First();
-                        availableZones.Remove(zone);
-                        mega.HomeZone = zone.ID;
-                    }
-                    break;
-                case MegaPlacementType.Isolated:
-                    foreach (var mega in megaPlacement)
-                    {
-                        var zone = availableZones
-                            .Where(z=>z.Wormholes.Count==1)
-                            .MaxBy(z =>
-                            {
-                                int soloChain = 0;
-                                var previous = z;
-                                var next = Cache.Get<ZoneData>(z.Wormholes.First());
-                                while (next.Wormholes.Count == 2)
-                                {
-                                    var temp = next;
-                                    next = Cache.Get<ZoneData>(next.Wormholes.First(w=>w != previous.ID));
-                                    previous = temp;
-                                    soloChain++;
-                                }
-
-                                return soloChain;
-                            });
-                        availableZones.Remove(zone);
-                        mega.HomeZone = zone.ID;
-                    }
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-    }
-    
     // public int ItemTier(CraftedItemData itemData)
     // {
     //     if (Tier.ContainsKey(itemData)) return Tier[itemData];
@@ -258,22 +106,22 @@ public class GameContext
 
     public ItemData GetData(ItemInstance item)
     {
-        return Cache.Get<ItemData>(item.Data);
+        return ItemData.Get<ItemData>(item.Data);
     }
 
     public SimpleCommodityData GetData(SimpleCommodity item)
     {
-        return Cache.Get<SimpleCommodityData>(item.Data);
+        return ItemData.Get<SimpleCommodityData>(item.Data);
     }
 
     public CraftedItemData GetData(CraftedItemInstance item)
     {
-        return Cache.Get<CraftedItemData>(item.Data);
+        return ItemData.Get<CraftedItemData>(item.Data);
     }
 
-    public EquippableItemData GetData(Gear gear)
+    public EquippableItemData GetData(EquippableItem equippableItem)
     {
-        return Cache.Get<EquippableItemData>(gear.Data);
+        return ItemData.Get<EquippableItemData>(equippableItem.Data);
     }
 
     public float GetMass(ItemInstance item)
@@ -290,20 +138,6 @@ public class GameContext
         return 0;
     }
 
-    public float GetSize(ItemInstance item)
-    {
-        var data = GetData(item);
-        switch (item)
-        {
-            case CraftedItemInstance _:
-                return data.Size;
-            case SimpleCommodity commodity:
-                return data.Size * commodity.Quantity;
-        }
-
-        return 0;
-    }
-
     public float GetThermalMass(ItemInstance item)
     {
         var data = GetData(item);
@@ -324,7 +158,7 @@ public class GameContext
         if (AffectedStats.ContainsKey(effect)) return AffectedStats[effect];
         
         // Get the data for the item the blueprint is for, return null if not found or not equippable
-        var blueprintItem = Cache.Get<EquippableItemData>(blueprint.Item);
+        var blueprintItem = ItemData.Get<EquippableItemData>(blueprint.Item);
         if (blueprintItem == null)
         {
             _logger($"Attempted to get stat effect but Blueprint {blueprint.ID} is not for an equippable item!");
@@ -364,7 +198,7 @@ public class GameContext
         var craftedIngredients = item.Ingredients.Where(i => i is CraftedItemInstance).ToArray();
         if (craftedIngredients.Length > 0)
         {
-            var ingredientQualityWeight = Cache.Get<CraftedItemData>(item.Data).IngredientQualityWeight;
+            var ingredientQualityWeight = ItemData.Get<CraftedItemData>(item.Data).IngredientQualityWeight;
             quality = quality * (1 - ingredientQualityWeight) +
                       craftedIngredients.Cast<CraftedItemInstance>().Average(CompoundQuality) * ingredientQualityWeight;
         }
@@ -375,21 +209,21 @@ public class GameContext
     }
 
     // Determine quality of either the item itself or the specific ingredient this stat depends on
-    public float Quality(PerformanceStat stat, Gear item)
+    public float Quality(PerformanceStat stat, EquippableItem item)
     {
-        var blueprint = Cache.Get<BlueprintData>(item.Blueprint);
+        var itemData = GetData(item);
+        var blueprint = ItemData.Get<BlueprintData>(item.Blueprint);
         var activeEffects = blueprint.StatEffects.Where(x => GetAffectedStat(blueprint, x) == stat).ToArray();
         float quality;
         if (!activeEffects.Any())
             quality = CompoundQuality(item);
         else
         {
-            var ingredientInstances = item.Ingredients.Select(i => Cache.Get<ItemInstance>(i)).ToArray();
-            var ingredients = ingredientInstances.Where(i => activeEffects.Any(e => e.Ingredient == i.Data)).ToArray();
+            var ingredients = item.Ingredients.Where(i => activeEffects.Any(e => e.Ingredient == i.Data)).ToArray();
             var distinctIngredients = ingredients.Select(i => i.Data).Distinct();
             if(distinctIngredients.Count() != activeEffects.Length)
             {
-                _logger($"Item {item.ID} does not have the ingredients specified by the stat effects of its blueprint!");
+                _logger($"Item {itemData.Name} does not have the ingredients specified by the stat effects of its blueprint!");
                 return 0;
             }
 
@@ -398,7 +232,7 @@ public class GameContext
             {
                 if (i is CraftedItemInstance ci)
                     sum += CompoundQuality(ci);
-                else _logger($"Blueprint stat effect for item {item.ID} specifies invalid (non crafted) ingredient!");
+                else _logger($"Blueprint stat effect for item {itemData.Name} specifies invalid (non crafted) ingredient!");
             }
 
             quality = sum / ingredients.Length;
@@ -408,7 +242,7 @@ public class GameContext
     }
 
     // Returns stat when not equipped
-    public float Evaluate(PerformanceStat stat, Gear item)
+    public float Evaluate(PerformanceStat stat, EquippableItem item)
     {
         var quality = pow(Quality(stat, item), stat.QualityExponent);
 
@@ -421,174 +255,173 @@ public class GameContext
     }
 
     // Returns stat using ship temperature and modifiers
-    public float Evaluate(PerformanceStat stat, Gear item, Entity entity)
+    public float Evaluate(PerformanceStat stat, EquippableItem item, Entity entity)
     {
         var itemData = GetData(item);
-
-        var heat = !stat.HeatDependent ? 1 : pow(itemData.Performance(entity.Temperature), Evaluate(itemData.HeatExponent,item));
-        var durability = !stat.DurabilityDependent ? 1 : pow(item.Durability / Evaluate(itemData.Durability, item), Evaluate(itemData.DurabilityExponent,item));
+    
+        //var heat = !stat.HeatDependent ? 1 : pow(itemData.Performance(entity.Temperature), Evaluate(itemData.HeatExponent,item));
+        var durability = !stat.DurabilityDependent ? 1 : pow(item.Durability / itemData.Durability, Evaluate(itemData.DurabilityExponent,item));
         var quality = pow(Quality(stat, item), stat.QualityExponent);
-
+    
         var scaleModifier = stat.GetScaleModifiers(entity).Values.Aggregate(1.0f, (current, mod) => current * mod);
-
+    
         var constantModifier = stat.GetConstantModifiers(entity).Values.Sum();
-
-        var result = lerp(stat.Min, stat.Max, heat * durability * quality) * scaleModifier + constantModifier;
+    
+        var result = lerp(stat.Min, stat.Max, durability * quality) * scaleModifier + constantModifier;
         if (float.IsNaN(result))
             return stat.Min;
         return result;
     }
 
-    public Entity CreateEntity(Guid zoneID, Guid corporation, Guid loadout)
-    {
-        if (!(Cache.Get(loadout) is LoadoutData loadoutData))
-        {
-            _logger("Attempted to spawn invalid loadout ID");
-            return null;
-        }
-
-        if (!(Cache.Get(loadoutData.Hull) is HullData hullData))
-        {
-            _logger("Attempted to spawn loadout with invalid hull ID");
-            return null;
-        }
-
-        if (!(Cache.Get(zoneID) is ZoneData zoneData))
-        {
-            _logger("Attempted to spawn entity with invalid zone ID");
-            return null;
-        }
-
-        if (!(Cache.Get(corporation) is Corporation corpData))
-        {
-            _logger("Attempted to spawn entity with invalid corporation ID");
-            return null;
-        }
-
-        var gearData = loadoutData.Gear
-            .Take(hullData.Hardpoints.Count)
-            .Where(id => id != Guid.Empty)
-            .Select(id => Cache.Get<GearData>(id))
-            .ToArray();
-
-        if (gearData.Any(g=>g==null))
-        {
-            _logger("Attempted to spawn loadout with invalid gear ID");
-            return null;
-        }
-
-        var gear = gearData
-            .Select(gd => CreateInstance(gd.ID, GlobalData.StartingGearQualityMin, GlobalData.StartingGearQualityMax))
-            .ToArray();
-
-        if (gear.Any(g=>g==null))
-            return null;
-        
-        foreach(var g in gear)
-            Cache.Add(g);
-
-        var cargoData = loadoutData.CompoundCargo
-            .SelectMany(x => Enumerable.Repeat(Cache.Get<CraftedItemData>(x.Key), x.Value))
-            .ToArray();
-
-        if (cargoData.Any(g=>g==null))
-        {
-            _logger("Attempted to spawn loadout with invalid cargo ID");
-            return null;
-        }
-
-        var cargo = cargoData
-            .Select(gd => CreateInstance(gd.ID, GlobalData.StartingGearQualityMin, GlobalData.StartingGearQualityMax))
-            .ToArray();
-
-        if (cargo.Any(g=>g==null))
-            return null;
-        
-        foreach(var c in cargo)
-            Cache.Add(c);
-
-        var simpleCargo = loadoutData.SimpleCargo?
-            .Select(x => CreateInstance(x.Key, x.Value))
-            .ToArray() ?? new SimpleCommodity[0];
-
-        if (simpleCargo.Any(g=>g==null))
-            return null;
-        
-        var hull = CreateInstance(loadoutData.Hull, GlobalData.StartingGearQualityMin, GlobalData.StartingGearQualityMax);
-        
-        if(hull==null)
-            return null;
-
-        // Get target zone
-        var zone = _zones[zoneID];
-
-        if (hullData.HullType == HullType.Ship)
-        {
-            var entity = CreateShip(hull.ID, gear.Select(g => g.ID),
-                cargo.Select(c => c.ID).Concat(simpleCargo.Select(c => c.ID)), zone, corporation, Guid.Empty, loadoutData.Name);
-            entity.Active = true;
-            return entity;
-        }
-
-        if (hullData.HullType == HullType.Station)
-        {
-            var distance = lerp(.2f, .8f, Random.NextFloat()) * zoneData.Radius;
-            var orbit = new OrbitData
-            {
-                Context = this,
-                Distance = new ReactiveProperty<float>(distance),
-                Parent = zone.Orbits.Values.Select(o=>o.Data)
-                    .First(orbitData => orbitData.Parent == Guid.Empty).ID,
-                Phase = Random.NextFloat()
-            };
-            zone.AddOrbit(orbit);
-            
-            var entity = new OrbitalEntity(this, hull.ID, gear.Select(g => g.ID),
-                cargo.Select(c => c.ID).Concat(simpleCargo.Select(c => c.ID)), orbit.ID, zone, corporation)
-            {
-                Name = $"{loadoutData.Name} {Random.NextInt(1,255):X}",
-                Temperature = 293,
-                Population = 4
-            };
-            entity.Active = true;
-            var parentCorp = Cache.Get<MegaCorporation>(corpData.Parent);
-            foreach (var attribute in parentCorp.Personality)
-                entity.Personality[attribute.Key] = attribute.Value;
-            Cache.Add(entity);
-
-            zone.Entities[entity.ID] = entity;
-            return entity;
-        }
-
-        return null;
-    }
-
-    public Ship CreateShip(Guid hull, IEnumerable<Guid> gear, IEnumerable<Guid> cargo, Zone zone, Guid corporation, Guid homeEntity, string typeName)
-    {
-
-        var ship = new Ship(this, hull, gear, cargo, zone, corporation)
-        {
-            Name = $"{typeName} {Random.NextInt(1,255):X}",
-            HomeEntity = homeEntity
-        };
-        Cache.Add(ship);
-
-        zone.Entities[ship.ID] = ship;
-        return ship;
-    }
+    // public Entity CreateEntity(Guid zoneID, Guid corporation, Guid loadout)
+    // {
+    //     if (!(ItemData.Get(loadout) is LoadoutData loadoutData))
+    //     {
+    //         _logger("Attempted to spawn invalid loadout ID");
+    //         return null;
+    //     }
+    //
+    //     if (!(ItemData.Get(loadoutData.Hull) is HullData hullData))
+    //     {
+    //         _logger("Attempted to spawn loadout with invalid hull ID");
+    //         return null;
+    //     }
+    //
+    //     if (!(ItemData.Get(zoneID) is ZoneData zoneData))
+    //     {
+    //         _logger("Attempted to spawn entity with invalid zone ID");
+    //         return null;
+    //     }
+    //
+    //     if (!(ItemData.Get(corporation) is Corporation corpData))
+    //     {
+    //         _logger("Attempted to spawn entity with invalid corporation ID");
+    //         return null;
+    //     }
+    //
+    //     var gearData = loadoutData.Gear
+    //         .Take(hullData.Hardpoints.Count)
+    //         .Where(id => id != Guid.Empty)
+    //         .Select(id => ItemData.Get<GearData>(id))
+    //         .ToArray();
+    //
+    //     if (gearData.Any(g=>g==null))
+    //     {
+    //         _logger("Attempted to spawn loadout with invalid gear ID");
+    //         return null;
+    //     }
+    //
+    //     var gear = gearData
+    //         .Select(gd => CreateInstance(gd.ID, GlobalData.StartingGearQualityMin, GlobalData.StartingGearQualityMax))
+    //         .ToArray();
+    //
+    //     if (gear.Any(g=>g==null))
+    //         return null;
+    //     
+    //     foreach(var g in gear)
+    //         ItemData.Add(g);
+    //
+    //     var cargoData = loadoutData.CompoundCargo
+    //         .SelectMany(x => Enumerable.Repeat(ItemData.Get<CraftedItemData>(x.Key), x.Value))
+    //         .ToArray();
+    //
+    //     if (cargoData.Any(g=>g==null))
+    //     {
+    //         _logger("Attempted to spawn loadout with invalid cargo ID");
+    //         return null;
+    //     }
+    //
+    //     var cargo = cargoData
+    //         .Select(gd => CreateInstance(gd.ID, GlobalData.StartingGearQualityMin, GlobalData.StartingGearQualityMax))
+    //         .ToArray();
+    //
+    //     if (cargo.Any(g=>g==null))
+    //         return null;
+    //     
+    //     foreach(var c in cargo)
+    //         ItemData.Add(c);
+    //
+    //     var simpleCargo = loadoutData.SimpleCargo?
+    //         .Select(x => CreateInstance(x.Key, x.Value))
+    //         .ToArray() ?? new SimpleCommodity[0];
+    //
+    //     if (simpleCargo.Any(g=>g==null))
+    //         return null;
+    //     
+    //     var hull = CreateInstance(loadoutData.Hull, GlobalData.StartingGearQualityMin, GlobalData.StartingGearQualityMax);
+    //     
+    //     if(hull==null)
+    //         return null;
+    //
+    //     // Get target zone
+    //     var zone = _zones[zoneID];
+    //
+    //     if (hullData.HullType == HullType.Ship)
+    //     {
+    //         var entity = CreateShip(hull.ID, gear.Select(g => g.ID),
+    //             cargo.Select(c => c.ID).Concat(simpleCargo.Select(c => c.ID)), zone, corporation, Guid.Empty, loadoutData.Name);
+    //         entity.Active = true;
+    //         return entity;
+    //     }
+    //
+    //     if (hullData.HullType == HullType.Station)
+    //     {
+    //         var distance = lerp(.2f, .8f, Random.NextFloat()) * zoneData.Radius;
+    //         var orbit = new OrbitData
+    //         {
+    //             Context = this,
+    //             Distance = new ReactiveProperty<float>(distance),
+    //             Parent = zone.Orbits.Values.Select(o=>o.Data)
+    //                 .First(orbitData => orbitData.Parent == Guid.Empty).ID,
+    //             Phase = Random.NextFloat()
+    //         };
+    //         zone.AddOrbit(orbit);
+    //         
+    //         var entity = new OrbitalEntity(this, hull.ID, gear.Select(g => g.ID),
+    //             cargo.Select(c => c.ID).Concat(simpleCargo.Select(c => c.ID)), orbit.ID, zone, corporation)
+    //         {
+    //             Name = $"{loadoutData.Name} {Random.NextInt(1,255):X}",
+    //             Temperature = 293,
+    //             Population = 4
+    //         };
+    //         entity.Active = true;
+    //         var parentCorp = ItemData.Get<MegaCorporation>(corpData.Parent);
+    //         foreach (var attribute in parentCorp.Personality)
+    //             entity.Personality[attribute.Key] = attribute.Value;
+    //         ItemData.Add(entity);
+    //
+    //         zone.Entities[entity.ID] = entity;
+    //         return entity;
+    //     }
+    //
+    //     return null;
+    // }
+    //
+    // public Ship CreateShip(Guid hull, IEnumerable<Guid> gear, IEnumerable<Guid> cargo, Zone zone, Guid corporation, Guid homeEntity, string typeName)
+    // {
+    //
+    //     var ship = new Ship(this, hull, gear, cargo, zone, corporation)
+    //     {
+    //         Name = $"{typeName} {Random.NextInt(1,255):X}",
+    //         HomeEntity = homeEntity
+    //     };
+    //     ItemData.Add(ship);
+    //
+    //     zone.Entities[ship.ID] = ship;
+    //     return ship;
+    // }
     
     public SimpleCommodity CreateInstance(Guid data, int count)
     {
-        var item = Cache.Get<SimpleCommodityData>(data);
+        var item = ItemData.Get<SimpleCommodityData>(data);
         if (item != null)
         {
             var newItem = new SimpleCommodity
             {
-                Context = this,
                 Data = data,
                 Quantity = count
             };
-            Cache.Add(newItem);
+            //ItemData.Add(newItem);
             return newItem;
         }
         
@@ -598,14 +431,14 @@ public class GameContext
     
     public CraftedItemInstance CreateInstance(Guid data, float qualityMin, float qualityMax)
     {
-        var item = Cache.Get<CraftedItemData>(data);
+        var item = ItemData.Get<CraftedItemData>(data);
         if (item == null)
         {
             _logger("Attempted to create crafted item instance using missing or incorrect item id!");
             return null;
         }
 
-        var blueprint = Cache.GetAll<BlueprintData>().FirstOrDefault(b => b.Item == data);
+        var blueprint = ItemData.GetAll<BlueprintData>().FirstOrDefault(b => b.Item == data);
         if (blueprint == null)
         {
             _logger("Attempted to create crafted item instance which has no blueprint!");
@@ -617,7 +450,7 @@ public class GameContext
         var ingredients = new List<ItemInstance>();
         foreach (var ingredient in blueprint.Ingredients)
         {
-            var itemData = Cache.Get<ItemData>(ingredient.Key);
+            var itemData = ItemData.Get<ItemData>(ingredient.Key);
             if (itemData is SimpleCommodityData)
             {
                 var itemInstance = CreateInstance(ingredient.Key, ingredient.Value);
@@ -651,69 +484,63 @@ public class GameContext
             _logger($"Unable to create crafted item ingredient: {invalidIngredient?.Name??"null"} for item {item.Name}");
         }
         
-        Cache.AddAll(ingredients);
-        
         if (item is EquippableItemData equippableItemData)
         {
-            var newGear = new Gear
+            var newGear = new EquippableItem
             {
-                Context = this,
                 Data = data,
-                Ingredients = ingredients.Select(i=>i.ID).ToList(),
+                Ingredients = ingredients,
                 Quality = Random.NextFloat(qualityMin, qualityMax),
                 Blueprint = blueprint.ID,
                 Name = $"{item.Name}"
             };
-            newGear.Durability = Evaluate(equippableItemData.Durability, newGear);
-            Cache.Add(newGear);
+            newGear.Durability = equippableItemData.Durability;
             return newGear;
         }
 
         var newCommodity = new CompoundCommodity
         {
-            Context = this,
             Data = data,
-            Ingredients = ingredients.Select(i=>i.ID).ToList(),
+            Ingredients = ingredients,
             Quality = Random.NextFloat(qualityMin, qualityMax),
             Blueprint = blueprint.ID,
             Name = $"{item.Name}"
         };
-        Cache.Add(newCommodity);
         return newCommodity;
     }
     
-    class DijkstraNode
-    {
-        public float Cost;
-        public DijkstraNode Parent;
-        public ZoneDefinition Zone;
-    }
-	
-    public List<ZoneDefinition> FindPath(ZoneDefinition source, ZoneDefinition target, bool bestFirst = false)
-    {
-        SortedList<float,DijkstraNode> members = new SortedList<float,DijkstraNode>{{0,new DijkstraNode{Zone = source}}};
-        List<DijkstraNode> searched = new List<DijkstraNode>();
-        while (true)
-        {
-            var s = members.FirstOrDefault(m => !searched.Contains(m.Value)).Value; // Lowest cost unsearched node
-            if (s == null) return null; // No vertices left unsearched
-            if (s.Zone == target) // We found the path
-            {
-                Stack<DijkstraNode> path = new Stack<DijkstraNode>(); // Since we start at the end, use a LIFO collection
-                path.Push(s);
-                while(path.Peek().Parent!=null) // Keep pushing until we reach the start, which has no parent
-                    path.Push(path.Peek().Parent);
-                return path.Select(dv => dv.Zone).ToList();
-            }
-            // For each adjacent star (filter already visited zones unless heuristic is in use)
-            foreach (var dijkstraStar in s.Zone.Links.WhereSelectF(i => !bestFirst || members.All(m => m.Value.Zone != GalaxyZones[i]),
-                    // Cost is parent cost plus distance
-                    i => new DijkstraNode {Parent = s, Zone = GalaxyZones[i], Cost = s.Cost + length(s.Zone.Position - GalaxyZones[i].Position)}))
-                // Add new member to list, sorted by cost plus optional heuristic
-                members.Add(bestFirst ? dijkstraStar.Cost + length(dijkstraStar.Zone.Position - target.Position) : dijkstraStar.Cost, dijkstraStar);
-            searched.Add(s);
-        }
-    }
+    // class DijkstraNode
+    // {
+    //     public float Cost;
+    //     public DijkstraNode Parent;
+    //     public ZoneDefinition Zone;
+    // }
+	   //
+    // public List<ZoneDefinition> FindPath(ZoneDefinition source, ZoneDefinition target, bool bestFirst = false)
+    // {
+    //     SortedList<float,DijkstraNode> members = new SortedList<float,DijkstraNode>{{0,new DijkstraNode{Zone = source}}};
+    //     List<DijkstraNode> searched = new List<DijkstraNode>();
+    //     while (true)
+    //     {
+    //         var s = members.FirstOrDefault(m => !searched.Contains(m.Value)).Value; // Lowest cost unsearched node
+    //         if (s == null) return null; // No vertices left unsearched
+    //         if (s.Zone == target) // We found the path
+    //         {
+    //             Stack<DijkstraNode> path = new Stack<DijkstraNode>(); // Since we start at the end, use a LIFO collection
+    //             path.Push(s);
+    //             while(path.Peek().Parent!=null) // Keep pushing until we reach the start, which has no parent
+    //                 path.Push(path.Peek().Parent);
+    //             return path.Select(dv => dv.Zone).ToList();
+    //         }
+    //         // For each adjacent star (filter already visited zones unless heuristic is in use)
+    //         foreach (var dijkstraStar in s.Zone.Links.WhereSelectF(i => !bestFirst || members.All(m => m.Value.Zone != GalaxyZones[i]),
+    //                 // Cost is parent cost plus distance
+    //                 i => new DijkstraNode {Parent = s, Zone = GalaxyZones[i], Cost = s.Cost + length(s.Zone.Position - GalaxyZones[i].Position)}))
+    //             // Add new member to list, sorted by cost plus optional heuristic
+    //             members.Add(bestFirst ? dijkstraStar.Cost + length(dijkstraStar.Zone.Position - target.Position) : dijkstraStar.Cost, dijkstraStar);
+    //         searched.Add(s);
+    //     }
+    // }
 
     // public bool MoveCargo(Entity source, Entity target, ItemInstance item, int quantity = int.MaxValue)
     // {
diff --git a/Assets/Scripts/ServerShared/GameContext.cs.meta b/Assets/Scripts/ServerShared/ItemManager.cs.meta
similarity index 100%
rename from Assets/Scripts/ServerShared/GameContext.cs.meta
rename to Assets/Scripts/ServerShared/ItemManager.cs.meta
diff --git a/Assets/Scripts/ServerShared/MathFormatters.cs b/Assets/Scripts/ServerShared/MathFormatters.cs
index a3e0acb5e..098ffab88 100644
--- a/Assets/Scripts/ServerShared/MathFormatters.cs
+++ b/Assets/Scripts/ServerShared/MathFormatters.cs
@@ -46,6 +46,47 @@ public class Float2Formatter : MessagePack.Formatters.IMessagePackFormatter<floa
     }
 }
 
+public class Int2Formatter : MessagePack.Formatters.IMessagePackFormatter<int2>
+{
+    public void Serialize(ref MessagePackWriter writer, int2 value, MessagePackSerializerOptions options)
+    {
+        writer.WriteArrayHeader(2);
+        writer.Write(value.x);
+        writer.Write(value.y);
+    }
+
+    public int2 Deserialize(ref MessagePackReader reader, MessagePackSerializerOptions options)
+    {
+        if (reader.IsNil)
+        {
+            throw new InvalidOperationException("typecode is null, struct not supported");
+        }
+
+        var length = reader.ReadArrayHeader();
+        var x = default(int);
+        var y = default(int);
+        for (int i = 0; i < length; i++)
+        {
+            var key = i;
+            switch (key)
+            {
+                case 0:
+                    x = reader.ReadInt32();
+                    break;
+                case 1:
+                    y = reader.ReadInt32();
+                    break;
+                default:
+                    reader.Skip();
+                    break;
+            }
+        }
+
+        var result = int2(x, y);
+        return result;
+    }
+}
+
 public class Float3Formatter : MessagePack.Formatters.IMessagePackFormatter<float3>
 {
     public void Serialize(ref MessagePackWriter writer, float3 value, MessagePackSerializerOptions options)
diff --git a/Assets/Scripts/ServerShared/MathResolver.cs b/Assets/Scripts/ServerShared/MathResolver.cs
index c3c50763f..cb823bfb5 100644
--- a/Assets/Scripts/ServerShared/MathResolver.cs
+++ b/Assets/Scripts/ServerShared/MathResolver.cs
@@ -37,25 +37,31 @@ internal static class MathResolverResolverGetFormatterHelper
     {
         // standard
         { typeof(float2), new Float2Formatter() },
+        { typeof(int2), new Int2Formatter() },
         { typeof(float3), new Float3Formatter() },
         { typeof(float4), new Float4Formatter() },
         { typeof(float2?), new StaticNullableFormatter<float2>(new Float2Formatter()) },
+        { typeof(int2?), new StaticNullableFormatter<int2>(new Int2Formatter()) },
         { typeof(float3?), new StaticNullableFormatter<float3>(new Float3Formatter()) },
         { typeof(float4?), new StaticNullableFormatter<float4>(new Float4Formatter()) },
 
         // standard + array
         { typeof(float2[]), new ArrayFormatter<float2>() },
+        { typeof(int2[]), new ArrayFormatter<int2>() },
         { typeof(float3[]), new ArrayFormatter<float3>() },
         { typeof(float4[]), new ArrayFormatter<float4>() },
         { typeof(float2?[]), new ArrayFormatter<float2?>() },
+        { typeof(int2?[]), new ArrayFormatter<float2?>() },
         { typeof(float3?[]), new ArrayFormatter<float3?>() },
         { typeof(float4?[]), new ArrayFormatter<float4?>() },
 
         // standard + list
         { typeof(List<float2>), new ListFormatter<float2>() },
+        { typeof(List<int2>), new ListFormatter<int2>() },
         { typeof(List<float3>), new ListFormatter<float3>() },
         { typeof(List<float4>), new ListFormatter<float4>() },
         { typeof(List<float2?>), new ListFormatter<float2?>() },
+        { typeof(List<int2?>), new ListFormatter<int2?>() },
         { typeof(List<float3?>), new ListFormatter<float3?>() },
         { typeof(List<float4?>), new ListFormatter<float4?>() },
     };
diff --git a/Assets/Scripts/ServerShared/Messages.cs b/Assets/Scripts/ServerShared/Messages.cs
index 3e2f69d51..ebc54b497 100644
--- a/Assets/Scripts/ServerShared/Messages.cs
+++ b/Assets/Scripts/ServerShared/Messages.cs
@@ -96,7 +96,7 @@ public class GalaxyResponseMessage : Message
 {
     [Key(0)] public ZoneDefinition[] Zones;
     [Key(1)] public GalaxyMapLayerData StarDensity;
-    [Key(2)] public GlobalData GlobalData;
+    // [Key(2)] public GlobalData GlobalData;
 }
 
 [MessagePackObject]
diff --git a/Assets/Scripts/ServerShared/OrbitalEntity.cs b/Assets/Scripts/ServerShared/OrbitalEntity.cs
index b816081cd..29ced1f1d 100644
--- a/Assets/Scripts/ServerShared/OrbitalEntity.cs
+++ b/Assets/Scripts/ServerShared/OrbitalEntity.cs
@@ -9,7 +9,7 @@ public class OrbitalEntity : Entity
 {
     public Guid OrbitData;
     
-    public OrbitalEntity(GameContext context, Guid hull, IEnumerable<Guid> gear, IEnumerable<Guid> cargo, Guid orbit, Zone zone, Guid corporation) : base(context, hull, gear, cargo, zone, corporation)
+    public OrbitalEntity(ItemManager itemManager, Zone zone, EquippableItem hull, Guid orbit) : base(itemManager, zone, hull)
     {
         OrbitData = orbit;
     }
diff --git a/Assets/Scripts/ServerShared/Settings.cs b/Assets/Scripts/ServerShared/Settings.cs
index c1b21d8ba..e653fa055 100644
--- a/Assets/Scripts/ServerShared/Settings.cs
+++ b/Assets/Scripts/ServerShared/Settings.cs
@@ -80,3 +80,18 @@ public class ZoneGenerationSettings
     public ExponentialLerp GasGiantBandSaturation;
     public ExponentialLerp GasGiantBandBrightness;
 }
+
+[Serializable, MessagePackObject(keyAsPropertyName: true), JsonObject]
+public class GameplaySettings
+{
+    public float WarpDistance = 25;
+    public float DockingDistance = 25;
+    public int SignificantDigits = 3;
+    public float ProductionPersonalityLerp = .05f;
+    public float MessageDuration = 4f;
+    public float TargetPersistenceDuration = 3;
+    public ExponentialLerp StartingGearQuality;
+    public float HeatRadiationExponent = 1;
+    public float HeatRadiationMultiplier = 1;
+    
+}
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Ship.cs b/Assets/Scripts/ServerShared/Ship.cs
index f32133d5a..fd9a3ba01 100644
--- a/Assets/Scripts/ServerShared/Ship.cs
+++ b/Assets/Scripts/ServerShared/Ship.cs
@@ -17,10 +17,9 @@ public class Ship : Entity
 
     // [IgnoreMember] public Dictionary<Targetable, float> Contacts = new Dictionary<Targetable, float>();
     // [IgnoreMember] public Targetable Target;
-    [JsonProperty("homeEntity"), Key(19)]
-    public Guid HomeEntity;
+    public Entity HomeEntity;
     
-    public Ship(GameContext context, Guid hull, IEnumerable<Guid> gear, IEnumerable<Guid> cargo, Zone zone, Guid corporation) : base(context, hull, gear, cargo, zone, corporation)
+    public Ship(ItemManager itemManager, Zone zone, EquippableItem hull) : base(itemManager, zone, hull)
     {
     }
 
diff --git a/Assets/Scripts/ServerShared/Zone.cs b/Assets/Scripts/ServerShared/Zone.cs
index 3c84e3338..43c349155 100644
--- a/Assets/Scripts/ServerShared/Zone.cs
+++ b/Assets/Scripts/ServerShared/Zone.cs
@@ -11,7 +11,7 @@ using Random = Unity.Mathematics.Random;
 public class Zone
 {
     //public HashSet<Guid> Planets = new HashSet<Guid>();
-    public Dictionary<Guid, Entity> Entities = new Dictionary<Guid, Entity>();
+    public List<Entity> Entities = new List<Entity>();
     //public Dictionary<Guid, OrbitData> Orbits = new Dictionary<Guid, OrbitData>();
     public Dictionary<Guid, BodyData> Planets = new Dictionary<Guid, BodyData>();
     public Dictionary<Guid, Planet> PlanetInstances = new Dictionary<Guid, Planet>();
@@ -55,7 +55,7 @@ public class Zone
             }
         }
         
-        foreach (var entity in pack.Entities) Entities.Add(entity.ID, entity);
+        foreach (var entity in pack.Entities) Entities.Add(entity);
 
         // TODO: Associate planets with stored entities for planetary colonies
     }
@@ -65,7 +65,7 @@ public class Zone
         return new ZonePack
         {
             Data = Data,
-            Entities = Entities.Values.ToList(),
+            Entities = Entities,
             Orbits = Orbits.Values.Select(o=>o.Data).ToList(),
             Planets = Planets.Values.ToList()
         };
@@ -90,7 +90,7 @@ public class Zone
         foreach (var asteroids in AsteroidBelts.Keys)
             UpdateAsteroidTransforms(asteroids);
         
-        foreach (var entity in Entities.Values) entity.Update(deltaTime);
+        foreach (var entity in Entities) entity.Update(deltaTime);
     }
 
     public float2 WormholePosition(ZoneDefinition target)
@@ -236,29 +236,30 @@ public class Zone
             belt.Damage[asteroid] = 0;
         belt.Damage[asteroid] = belt.Damage[asteroid] + damage;
         
-        if (!belt.MiningAccumulator.ContainsKey((miner.ID, asteroid)))
-            belt.MiningAccumulator[(miner.ID, asteroid)] = 0;
-        belt.MiningAccumulator[(miner.ID, asteroid)] = belt.MiningAccumulator[(miner.ID, asteroid)] + damage;
+        if (!belt.MiningAccumulator.ContainsKey((miner, asteroid)))
+            belt.MiningAccumulator[(miner, asteroid)] = 0;
+        belt.MiningAccumulator[(miner, asteroid)] = belt.MiningAccumulator[(miner, asteroid)] + damage;
         
         if (belt.Damage[asteroid] > asteroidHitpoints)
         {
             belt.RespawnTimers[asteroid] = _settings.AsteroidRespawnTime.Evaluate(size);
             belt.Damage.Remove(asteroid);
-            belt.MiningAccumulator.Remove((miner.ID, asteroid));
+            belt.MiningAccumulator.Remove((miner, asteroid));
             return;
         }
 
         var resourceCount = beltData.Resources.Sum(x => x.Value);
         var resource = beltData.Resources.MaxBy(x => pow(x.Value, 1f / penetration) * _random.NextFloat());
-        if (efficiency * _random.NextFloat() * belt.MiningAccumulator[(miner.ID, asteroid)] * resourceCount / _settings.MiningDifficulty > 1 && miner.OccupiedCapacity < miner.Capacity - 1)
+        if (efficiency * _random.NextFloat() * belt.MiningAccumulator[(miner, asteroid)] * resourceCount / _settings.MiningDifficulty > 1)
         {
-            belt.MiningAccumulator.Remove((miner.ID, asteroid));
-            var newSimpleCommodity = new SimpleCommodity
-            {
-                Data = resource.Key,
-                Quantity = 1
-            };
-            miner.AddCargo(newSimpleCommodity);
+            belt.MiningAccumulator.Remove((miner, asteroid));
+            // var newSimpleCommodity = new SimpleCommodity
+            // {
+            //     Data = resource.Key,
+            //     Quantity = 1
+            // };
+            // TODO: Drop item onto the Grid
+            //miner.AddCargo(newSimpleCommodity);
         }
     }
     public float GetHeight(float2 position)
@@ -393,7 +394,7 @@ public class AsteroidBelt
     public float4[] PreviousTransforms; // x, y, rotation, scale
     public Dictionary<int, float> RespawnTimers = new Dictionary<int, float>();
     public Dictionary<int, float> Damage = new Dictionary<int, float>();
-    public Dictionary<(Guid, int), float> MiningAccumulator = new Dictionary<(Guid, int), float>();
+    public Dictionary<(Entity, int), float> MiningAccumulator = new Dictionary<(Entity, int), float>();
 
     public AsteroidBelt(AsteroidBeltData data)
     {
diff --git a/Assets/Scripts/ServerShared/ZoneGenerator.cs b/Assets/Scripts/ServerShared/ZoneGenerator.cs
index 9fbde6edb..e3c5e43d4 100644
--- a/Assets/Scripts/ServerShared/ZoneGenerator.cs
+++ b/Assets/Scripts/ServerShared/ZoneGenerator.cs
@@ -11,24 +11,24 @@ using Random = Unity.Mathematics.Random;
 
 public class ZoneGenerator
 {
-	public static ZonePack GenerateZone(
-		ZoneGenerationSettings settings,
-		Dictionary<string,GalaxyMapLayerData> mapLayers,
-		IEnumerable<SimpleCommodityData> resources,
-		string name,
-		float2 position)
-	{
-		var random = new Random(Convert.ToUInt32(abs(name.GetHashCode())));
-		var radius = settings.ZoneRadius.Evaluate(random.NextFloat() * mapLayers["Radius"].Evaluate(position, settings.ShapeSettings));
-		var mass = settings.ZoneMass.Evaluate(random.NextFloat() * mapLayers["Mass"].Evaluate(position, settings.ShapeSettings));
-
-		return GenerateZone(settings, mapLayers, resources, name, position, mass, radius, random);
-	}
+	// public static ZonePack GenerateZone(
+	// 	ZoneGenerationSettings settings,
+	// 	Dictionary<string,GalaxyMapLayerData> mapLayers,
+	// 	IEnumerable<SimpleCommodityData> resources,
+	// 	string name,
+	// 	float2 position)
+	// {
+	// 	var random = new Random(Convert.ToUInt32(abs(name.GetHashCode())));
+	// 	var radius = settings.ZoneRadius.Evaluate(random.NextFloat() * mapLayers["Radius"].Evaluate(position, settings.ShapeSettings));
+	// 	var mass = settings.ZoneMass.Evaluate(random.NextFloat() * mapLayers["Mass"].Evaluate(position, settings.ShapeSettings));
+	//
+	// 	return GenerateZone(settings, mapLayers, resources, name, position, mass, radius, random);
+	// }
 
 	public static ZonePack GenerateZone(
 		ZoneGenerationSettings settings,
-		Dictionary<string,GalaxyMapLayerData> mapLayers,
-		IEnumerable<SimpleCommodityData> resources,
+		// Dictionary<string,GalaxyMapLayerData> mapLayers,
+		// IEnumerable<SimpleCommodityData> resources,
 		float mass,
 		float radius)
 	{
@@ -36,13 +36,13 @@ public class ZoneGenerator
 		var position = float2(0f);
 		var random = new Random(Convert.ToUInt32(abs(name.GetHashCode())));
 		
-		return GenerateZone(settings, mapLayers, resources, name, position, mass, radius, random);
+		return GenerateZone(settings, name, position, mass, radius, random);
 	}
 	
 	private static ZonePack GenerateZone(
 		ZoneGenerationSettings settings,
-		Dictionary<string,GalaxyMapLayerData> mapLayers,
-		IEnumerable<SimpleCommodityData> resources,
+		// Dictionary<string,GalaxyMapLayerData> mapLayers,
+		// IEnumerable<SimpleCommodityData> resources,
 		string name,
 		float2 position,
 		float mass,
@@ -92,25 +92,25 @@ public class ZoneGenerator
                 : Guid.Empty;
         
         // Cache resource densities
-        var resourceMaps = mapLayers.Values
-	        .ToDictionary(m => m.ID, m => m.Evaluate(zone.Position, settings.ShapeSettings));
+        // var resourceMaps = mapLayers.Values
+	       //  .ToDictionary(m => m.ID, m => m.Evaluate(zone.Position, settings.ShapeSettings));
         
         pack.Planets = planets.Where(p=>!p.Empty).Select(planet =>
         {
-	        Dictionary<Guid, float> planetResources = new Dictionary<Guid, float>();
+	        // Dictionary<Guid, float> planetResources = new Dictionary<Guid, float>();
 	        BodyType bodyType = planet.Belt ? BodyType.Asteroid :
 		        planet.Mass > settings.SunMass ? BodyType.Sun :
 		        planet.Mass > settings.GasGiantMass ? BodyType.GasGiant :
 		        planet.Mass > settings.PlanetMass ? BodyType.Planet : BodyType.Planetoid;
 	        
-	        foreach (var r in resources)
-	        {
-		        if ((bodyType & r.ResourceBodyType) != 0)
-		        {
-			        float quantity = ResourceValue(ref random, settings, r, r.ResourceDensity.Aggregate(1f, (m, rdm) => m * resourceMaps[rdm]));
-			        if (r.Floor < quantity) planetResources.Add(r.ID, quantity);
-		        }
-	        }
+	        // foreach (var r in resources)
+	        // {
+		       //  if ((bodyType & r.ResourceBodyType) != 0)
+		       //  {
+			      //   float quantity = ResourceValue(ref random, settings, r, r.ResourceDensity.Aggregate(1f, (m, rdm) => m * resourceMaps[rdm]));
+			      //   if (r.Floor < quantity) planetResources.Add(r.ID, quantity);
+		       //  }
+	        // }
 
 	        BodyData planetData;
 	        switch (bodyType)
@@ -134,7 +134,7 @@ public class ZoneGenerator
 
 	        planetData.Mass.Value = planet.Mass;
 	        planetData.Orbit = orbitMap[planet].ID;
-	        planetData.Resources = planetResources;
+	        // planetData.Resources = planetResources;
             planetData.Name.Value = planetData.ID.ToString().Substring(0, 8);
             if (planetData is AsteroidBeltData beltData)
             {
@@ -199,11 +199,11 @@ public class ZoneGenerator
         return pack;
 	}
 	
-	static float ResourceValue(ref Random random, ZoneGenerationSettings settings, SimpleCommodityData resource, float density)
-	{
-		return random.NextPowerDistribution(resource.Minimum, resource.Maximum, resource.Exponent,
-			1 / lerp(settings.ResourceDensityMinimum, settings.ResourceDensityMaximum, density));
-	}
+	// static float ResourceValue(ref Random random, ZoneGenerationSettings settings, SimpleCommodityData resource, float density)
+	// {
+	// 	return random.NextPowerDistribution(resource.Minimum, resource.Maximum, resource.Exponent,
+	// 		1 / lerp(settings.ResourceDensityMinimum, settings.ResourceDensityMaximum, density));
+	// }
 
 	public static GeneratorPlanet[] GenerateEntities(ZoneGenerationSettings settings, ref Random random, ZoneData zone)
 	{
diff --git a/Assets/Scripts/TechTreeMsagl.cs b/Assets/Scripts/TechTreeMsagl.cs
index 11db11faa..c898d9eb9 100644
--- a/Assets/Scripts/TechTreeMsagl.cs
+++ b/Assets/Scripts/TechTreeMsagl.cs
@@ -67,7 +67,7 @@ public class TechTreeMsagl : MonoBehaviour
     public Material TechArrowMaterial;
     public Material TechLinkMaterial;
 
-    public GameContext Context;
+    public ItemManager Context;
 
     private List<Prototype> _ringInstances = new List<Prototype>();
     private List<Prototype> _techInstances = new List<Prototype>();
@@ -334,14 +334,14 @@ public class TechTreeMsagl : MonoBehaviour
                     var blueprint = (BlueprintData) vertex.UserData;
                     PropertiesPanel.Title.text = blueprint.Name;
                     PropertiesPanel.AddProperty("Research Time", () => $"{blueprint.ResearchTime:0.##} MH");
-                    PropertiesPanel.AddProperty("Produces", () => $"{Context.Cache.Get<ItemData>(blueprint.Item).Name}");
+                    PropertiesPanel.AddProperty("Produces", () => $"{Context.ItemData.Get<ItemData>(blueprint.Item).Name}");
                     PropertiesPanel.AddProperty("Production Quality", () => $"{Mathf.RoundToInt(blueprint.Quality * 100)}%");
                     PropertiesPanel.AddProperty("Production Time", () => $"{blueprint.ProductionTime:0.##} MH");
                     
                     var ingredientsList = PropertiesPanel.AddList("Ingredients");
                     foreach (var ingredient in blueprint.Ingredients)
                     {
-                        var ingredientData = Context.Cache.Get<ItemData>(ingredient.Key);
+                        var ingredientData = Context.ItemData.Get<ItemData>(ingredient.Key);
                         ingredientsList.AddProperty(ingredientData.Name, () => ingredient.Value.ToString());
                     }
                     ingredientsList.SetExpanded(true, true);
@@ -349,7 +349,7 @@ public class TechTreeMsagl : MonoBehaviour
                     var dependenciesList = PropertiesPanel.AddList("Dependencies");
                     foreach (var dependency in blueprint.Dependencies)
                     {
-                        var dependencyBlueprint = Context.Cache.Get<BlueprintData>(dependency);
+                        var dependencyBlueprint = Context.ItemData.Get<BlueprintData>(dependency);
                         dependenciesList.AddProperty(dependencyBlueprint.Name);
                     }
                     dependenciesList.SetExpanded(true, true);
diff --git a/Assets/Scripts/UI/ColonyTab.cs b/Assets/Scripts/UI/ColonyTab.cs
deleted file mode 100644
index c92213332..000000000
--- a/Assets/Scripts/UI/ColonyTab.cs
+++ /dev/null
@@ -1,450 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using TMPro;
-using UnityEngine;
-using UnityEngine.EventSystems;
-using Unity.Mathematics;
-using static Unity.Mathematics.math;
-
-public class ColonyTab : MonoBehaviour
-{
-    public TextMeshProUGUI Title;
-    public PropertiesPanel General;
-    public PropertiesPanel Inventory;
-    public PropertiesPanel ChildInventory;
-    public PropertiesPanel Details;
-    public ContextMenu ContextMenu;
-    public ConfirmationDialog ConfirmationDialog;
-
-    public GameContext Context
-    {
-        get => _context;
-        set
-        {
-            _context = value;
-            General.Context = value;
-            Inventory.Context = value;
-            ChildInventory.Context = value;
-            Details.Context = value;
-        }
-    }
-
-    private GameContext _context;
-    private Hardpoint _selectedHardpoint;
-    private Entity _parentEntity;
-    private Entity _selectedChild;
-    
-    private IChangeSource _colonyGearChange;
-    private IChangeSource _colonyCargoChange;
-    private Action _onColonyInventoryChanged;
-    
-    private IChangeSource _childGearChange;
-    private IChangeSource _childCargoChange;
-    private Action _onChildInventoryChanged;
-
-    public void Open(Guid colony)
-    {
-        _selectedHardpoint = null;
-
-        _parentEntity = Context.Cache.Get<Entity>(colony);
-        
-        Title.text = _parentEntity.Name;
-
-        UpdateGeneral(_parentEntity);
-        
-        UpdateInventory(_parentEntity, Inventory);
-    }
-
-    private void OnDisable()
-    {
-        if (_onColonyInventoryChanged == null)
-            return;
-        _colonyGearChange.OnChanged -= _onColonyInventoryChanged;
-        _colonyCargoChange.OnChanged -= _onColonyInventoryChanged;
-        Details.Clear();
-        DeselectChild();
-    }
-
-    private void DeselectChild()
-    {
-        if (_onChildInventoryChanged == null)
-            return;
-        _childGearChange.OnChanged -= _onChildInventoryChanged;
-        _childGearChange.OnChanged -= _onChildInventoryChanged;
-        ChildInventory.Clear();
-    }
-
-    public void UpdateGeneral(Entity entity)
-    {
-        General.Clear();
-        
-        General.AddEntityProperties(entity);
-        General.AddProperty("Assigned Population", () => $"{entity.AssignedPopulation}/{entity.Population}");
-        
-        var personalityList = General.AddList("Personality");
-        foreach (var attribute in entity.Personality.Keys)
-            personalityList.AddPersonalityProperty(Context.Cache.Get<PersonalityAttribute>(attribute),
-                () => entity.Personality[attribute]);
-        // personalityList.SetExpanded(false, true);
-
-        var childList = General.AddList("Children");
-        childList.InspectChildren(entity, child =>
-        {
-            _selectedChild = child;
-            UpdateInventory(child, ChildInventory);
-        });
-        // childList.SetExpanded(false, true);
-        
-        General.RefreshValues();
-    }
-
-    public void UpdateInventory(Entity entity, PropertiesPanel panel)
-    {
-        if (panel == Inventory)
-        {
-            _colonyGearChange = entity.GearEvent;
-            _colonyCargoChange = entity.CargoEvent;
-            _onColonyInventoryChanged = () => RefreshInventory(entity, panel);
-            _colonyGearChange.OnChanged += _onColonyInventoryChanged;
-            _colonyCargoChange.OnChanged += _onColonyInventoryChanged;
-            RefreshInventory(entity, panel);
-        }
-        else
-        {
-            DeselectChild();
-            _childGearChange = entity.GearEvent;
-            _childCargoChange = entity.CargoEvent;
-            _onChildInventoryChanged = () => RefreshInventory(entity, panel, true);
-            _childGearChange.OnChanged += _onChildInventoryChanged;
-            _childCargoChange.OnChanged += _onChildInventoryChanged;
-            RefreshInventory(entity, panel, true);
-        }
-        
-    }
-    
-    void RefreshInventory(Entity entity, PropertiesPanel panel, bool child = false)
-    {
-        //Debug.Log("Refreshing Inventory!");
-        var corporation = Context.Cache.Get<Corporation>(entity.Corporation);
-        var blueprints = corporation.UnlockedBlueprints.Select(id => Context.Cache.Get<BlueprintData>(id));
-
-        // Create item data mapping for cargo
-        var cargoData = entity.Cargo.ToDictionary(id => _context.Cache.Get<ItemInstance>(id),
-            id => Context.Cache.Get<ItemData>(_context.Cache.Get<ItemInstance>(id).Data));
-        
-        panel.Clear();
-
-        if (child)
-        {
-            panel.Title.text = entity.Name;
-            panel.AddField("Active", () => entity.Active, active => entity.Active = active);
-            panel.AddSection("General");
-            panel.AddEntityProperties(entity);
-        }
-        
-        panel.AddSection("Hardpoints");
-        var incompleteGearList = entity.IncompleteGear.Keys
-            .Select(id => Context.Cache.Get<Gear>(id))
-            .ToList();
-        // Skip first hardpoint, that one is always the hull
-        foreach (var hardpoint in entity.Hardpoints.Skip(1))
-        {
-            // These are the items in the inventory which can be equipped to the current hardpoint
-            var matchingCargoGear = cargoData
-                .Where(x => 
-                    x.Value is GearData gearData &&
-                    gearData.HardpointType == hardpoint.HardpointData.Type)
-                .Select(x => x.Key as Gear)
-                .ToArray();
-
-            // Hardpoint has no gear assigned to it
-            if (hardpoint.Gear == null)
-            {
-                // Check whether we're currently building some gear for this hardpoint
-                var incompleteGear = incompleteGearList.FirstOrDefault(g => g.ItemData.HardpointType == hardpoint.HardpointData.Type);
-                
-                // We're building something for this hardpoint, show a progress bar!
-                if (incompleteGear != null)
-                {
-                    incompleteGearList.Remove(incompleteGear);
-                    panel.AddProgressField(incompleteGear.Name, () =>
-                    {
-                        var productionTime = _context.Cache.Get<BlueprintData>(incompleteGear.Blueprint).ProductionTime;
-                        return (productionTime - (float) entity.IncompleteGear[incompleteGear.ID]) / productionTime;
-                    });
-                }
-                else // We're not building anything
-                {
-                    // These are the blueprints we could build onto this hardpoint directly
-                    var matchingBlueprints = blueprints.Where(bp =>
-                        bp.FactoryItem == Guid.Empty &&
-                        Context.Cache.Get<ItemData>(bp.Item) is GearData gearData &&
-                        gearData.HardpointType == hardpoint.HardpointData.Type).ToArray();
-                    
-                    Action<PointerEventData> onClick = null;
-                    if (matchingCargoGear.Any() || matchingBlueprints.Any())
-                        onClick = data =>
-                        {
-                            if (data.button == PointerEventData.InputButton.Left)
-                                PopulateDetails(entity, matchingBlueprints);
-                            
-                            else if (data.button == PointerEventData.InputButton.Right)
-                            {
-                                ContextMenu.gameObject.SetActive(true);
-                                ContextMenu.Clear();
-                                if (matchingCargoGear.Any())
-                                    ContextMenu.AddDropdown("Install", matchingCargoGear
-                                        .Select<Gear, (string, Action, bool)>(gear => (gear.Name, () => entity.Equip(gear, hardpoint), true)));
-                                if (matchingBlueprints.Any())
-                                    ContextMenu.AddDropdown("Build", matchingBlueprints
-                                        .Select<BlueprintData, (string, Action, bool)>(blueprint =>
-                                            (blueprint.Name, () => 
-                                                    entity.Build(blueprint, 1, _context.Cache.Get<ItemData>(blueprint.Item).Name, true),
-                                                entity.GetBlueprintIngredients(blueprint, out _, out _))));
-                                ContextMenu.Show();
-                            }
-                        };
-                    panel.AddProperty($"Empty {Enum.GetName(typeof(HardpointType), hardpoint.HardpointData.Type)} Hardpoint", null, onClick, matchingBlueprints.Any());
-                }
-            }
-            else
-            {
-                var prop = panel.AddProperty(hardpoint.Gear.Name, null, data =>
-                {
-                    if (data.button == PointerEventData.InputButton.Left)
-                    {
-                        if (data.clickCount == 1)
-                        {
-                            _selectedHardpoint = hardpoint;
-                            Details.Inspect(entity, hardpoint);
-                        }
-
-                        if (data.clickCount == 2)
-                        {
-                            entity.Unequip(hardpoint);
-                        }
-                    }
-                }, true);
-                prop.Button.DisableClickWhenSelected = false;
-
-                if (hardpoint == _selectedHardpoint)
-                {
-                    panel.SelectedChild = prop.Button;
-                    prop.Button.CurrentState = FlatButtonState.Selected;
-                }
-            }
-        }
-        
-        if(!entity.Cargo.Any())
-            panel.AddSection("No Cargo");
-        else
-        {
-            Action<Guid, int> showHaulingDialog = (id, maxQuantity) =>
-            {
-                var itemData = Context.Cache.Get<ItemData>(id);
-                ConfirmationDialog.gameObject.SetActive(true);
-                ConfirmationDialog.Clear();
-                ConfirmationDialog.Title.text = $"Haul {itemData.Name}";
-                var quantity = maxQuantity;
-                var colonies = Context.Cache.GetAll<Entity>()
-                    .Where(e => e.Corporation == entity.Corporation && e is OrbitalEntity && e != entity).ToArray();
-                var colonyNames = colonies.Select(c => c.Name).ToArray();
-                ConfirmationDialog.AddField("Quantity", () => quantity, i => quantity = clamp(i, 1, maxQuantity));
-                var selectedColony = 0;
-                ConfirmationDialog.AddField("Target Colony", () => selectedColony, i => selectedColony = i,
-                    colonyNames);
-                ConfirmationDialog.Show(() =>
-                {
-                    var haulingTask = new HaulingTask
-                    {
-                        Context = Context,
-                        ItemType = id,
-                        Origin = entity.ID,
-                        Quantity = quantity,
-                        Target = colonies[selectedColony].ID,
-                        Zone = entity.Zone.Data.ID
-                    };
-                    Context.Cache.Add(haulingTask);
-                    var corp = Context.Cache.Get<Corporation>(entity.Corporation);
-                    corp.Tasks.Add(haulingTask.ID);
-                });
-            };
-            
-            panel.AddSection("Cargo");
-            foreach (var itemID in entity.Cargo.Where(id => Context.Cache.Get<ItemInstance>(id) is SimpleCommodity))
-            {
-                var simpleCommodity = Context.Cache.Get<SimpleCommodity>(itemID);
-                var data = simpleCommodity.ItemData;
-                panel.AddProperty(data.Name, () => simpleCommodity.Quantity.ToString(), eventData =>
-                {
-                    if (eventData.button == PointerEventData.InputButton.Left)
-                    {
-                        Details.Clear();
-                        Details.RemoveListener();
-                        Details.AddItemProperties(entity, simpleCommodity);
-                        Details.RefreshValues();
-                    }
-                    else if (eventData.button == PointerEventData.InputButton.Right)
-                    {
-                        ContextMenu.gameObject.SetActive(true);
-                        ContextMenu.Clear();
-                        ContextMenu.AddOption("Haul", () => showHaulingDialog(simpleCommodity.Data, simpleCommodity.Quantity));
-                        ContextMenu.Show();
-                    }
-                }, true).Button.DragSuccess = eventData =>
-                {
-                    Entity targetEntity = null;
-                    if (panel == Inventory &&
-                        _selectedChild != null &&
-                        ((RectTransform) ChildInventory.transform).ContainsWorldPoint(eventData.position))
-                        targetEntity = _selectedChild;
-                    else if (panel == ChildInventory &&
-                             ((RectTransform) Inventory.transform).ContainsWorldPoint(eventData.position))
-                        targetEntity = _parentEntity;
-
-                    if (targetEntity != null)
-                    {
-                        int maxQuantity = min((int) ((targetEntity.Capacity - targetEntity.OccupiedCapacity) / simpleCommodity.ItemData.Size), simpleCommodity.Quantity);
-                        if (maxQuantity > 0)
-                        {
-                            ConfirmationDialog.gameObject.SetActive(true);
-                            ConfirmationDialog.Clear();
-                            ConfirmationDialog.Title.text = $"Move {simpleCommodity.ItemData.Name}";
-                            var quantity = maxQuantity;
-                            ConfirmationDialog.AddField("Quantity", () => quantity, i => quantity = clamp(i, 1, maxQuantity));
-                            ConfirmationDialog.Show(() =>
-                            {
-                                var newItem = entity.RemoveCargo(simpleCommodity, quantity);
-                                targetEntity.AddCargo(newItem);
-                            });
-                        }
-                    }
-
-                    return false;
-                };
-            }
-
-            foreach (var group in entity.Cargo
-                .Select(id => Context.Cache.Get<ItemInstance>(id))
-                .Where(item => item is CraftedItemInstance)
-                .Cast<CraftedItemInstance>()
-                .GroupBy(craftedItem =>
-                {
-                    var corp = "GameCult";
-                    if (craftedItem.SourceEntity != Guid.Empty)
-                        corp = Context.Cache.Get<Corporation>(Context.Cache.Get<Entity>(craftedItem.SourceEntity).Corporation).Name;
-                    return (craftedItem.Data, craftedItem.Name, corp);
-                }))
-            {
-                Action<CraftedItemInstance, PointerEventData> onClick = (item, data) =>
-                {
-                    if (data.button == PointerEventData.InputButton.Left)
-                    {
-                        if (data.clickCount == 1)
-                        {
-                            Details.Clear();
-                            Details.RemoveListener();
-                            Details.AddItemProperties(entity, item);
-                            Details.RefreshValues();
-                        }
-                        else if (data.clickCount == 2 && item is Gear gear)
-                        {
-                            // Item is a hull, create a ship entity and make it a child
-                            if (gear.ItemData is HullData)
-                            {
-                                entity.RemoveCargo(gear);
-                                var ship = Context.CreateShip(gear.ID, Enumerable.Empty<Guid>(),
-                                    Enumerable.Empty<Guid>(), entity.Zone, entity.Corporation, _parentEntity.ID, gear.Name);
-                                ship.SetParent(entity);
-                            }
-                            else // Equip Item
-                                entity.Equip(gear.ID, true);
-                        }
-                    }
-                    else if (data.button == PointerEventData.InputButton.Right)
-                    {
-                        ContextMenu.gameObject.SetActive(true);
-                        ContextMenu.Clear();
-                        ContextMenu.AddOption("Haul", () => showHaulingDialog(item.Data, group.Count()));
-                        ContextMenu.Show();
-                    }
-                };
-                Func<PointerEventData, CraftedItemInstance, bool> dragSuccess = (data, item) =>
-                {
-                    Entity targetEntity = null;
-                    if (panel == Inventory &&
-                        _selectedChild != null &&
-                        ((RectTransform) ChildInventory.transform).ContainsWorldPoint(data.position))
-                        targetEntity = _selectedChild;
-                    else if (panel == ChildInventory &&
-                             ((RectTransform) Inventory.transform).ContainsWorldPoint(data.position))
-                        targetEntity = _parentEntity;
-
-                    if (targetEntity != null)
-                    {
-                        if (targetEntity.Capacity - targetEntity.OccupiedCapacity >
-                            Context.Cache.Get<ItemData>(item.Data).Size)
-                        {
-                            entity.RemoveCargo(item);
-                            targetEntity.AddCargo(item);
-                            return true;
-                        }
-                    }
-
-                    return false;
-                };
-                if (group.Count() == 1)
-                {
-                    var item = group.First();
-                    var button = panel.AddProperty(item.Name, null, eventData => onClick(item, eventData), true).Button;
-                    button.DisableClickWhenSelected = false;
-                    button.DragSuccess = data => dragSuccess(data, item);
-                }
-                else
-                {
-                    var instanceList = panel.AddList($"{group.Count().ToString()} {group.Key.Name}");
-                    foreach (var item in group)
-                    {
-                        var button = instanceList.AddProperty(item.Name, null, eventData => onClick(item, eventData), true).Button;
-                        button.DisableClickWhenSelected = false;
-                        button.DragSuccess = data => dragSuccess(data, item);
-                    }
-                    // instanceList.SetExpanded(false, true);
-                }
-            }
-        }
-        panel.RefreshValues();
-    }
-    
-    void PopulateDetails(Entity entity, IEnumerable<BlueprintData> blueprints)
-    {
-        Details.RemoveListener();
-        Details.Clear();
-        foreach (var blueprint in blueprints)
-        {
-            var blueprintList = Details.AddList(blueprint.Name);
-                                    
-            foreach (var ingredient in blueprint.Ingredients)
-            {
-                var itemData = _context.Cache.Get<ItemData>(ingredient.Key);
-                blueprintList.AddProperty(itemData.Name, () => ingredient.Value.ToString());
-            }
-                                    
-            var bpItemData = _context.Cache.Get<ItemData>(blueprint.Item);
-
-            if(entity.GetBlueprintIngredients(blueprint, out _, out _))
-                blueprintList.AddButton("Build", _ =>
-                {
-                    entity.Build(blueprint, 1, bpItemData.Name, true);
-                    Details.Clear();
-                });
-            
-            blueprintList.RefreshValues();
-            // blueprintList.SetExpanded(false, true);
-        }
-        Details.RefreshValues();
-    }
-}
diff --git a/Assets/Scripts/UI/PropertiesPanel.cs b/Assets/Scripts/UI/PropertiesPanel.cs
index d177a9375..423340747 100644
--- a/Assets/Scripts/UI/PropertiesPanel.cs
+++ b/Assets/Scripts/UI/PropertiesPanel.cs
@@ -30,7 +30,7 @@ public class PropertiesPanel : MonoBehaviour
     public ButtonField ButtonField;
     public IncrementField IncrementField;
     [HideInInspector] public FlatFlatButton SelectedChild;
-    [HideInInspector] public GameContext Context;
+    [HideInInspector] public ItemManager Context;
 
     protected List<GameObject> Properties = new List<GameObject>();
     protected List<FlatFlatButton> Buttons = new List<FlatFlatButton>();
@@ -38,7 +38,6 @@ public class PropertiesPanel : MonoBehaviour
     protected bool RadioSelection = false;
 
     protected event Action<GameObject> OnPropertyAdded;
-    protected IChangeSource ChangeSource;
     protected Action OnPropertiesChanged;
 
     public int Children => Properties.Count + Buttons.Count;
@@ -55,7 +54,6 @@ public class PropertiesPanel : MonoBehaviour
 
     private void OnDestroy()
     {
-	    RemoveListener();
     }
 
     // private void OnDisable()
@@ -332,23 +330,12 @@ public class PropertiesPanel : MonoBehaviour
 		Properties.Add(field.gameObject);
 		OnPropertyAdded?.Invoke(field.gameObject);
 	}
-
-	public void RemoveListener()
-	{
-		if (ChangeSource != null)
-		{
-			ChangeSource.OnChanged -= OnPropertiesChanged;
-			ChangeSource = null;
-			OnPropertiesChanged = null;
-		}
-	}
 	
 	public void Inspect(Entity entity)
 	{
         Clear();
         Title.text = entity.Name;
-        var hull = Context.Cache.Get<Gear>(entity.Hull);
-        var hullData = Context.Cache.Get<HullData>(hull.Data);
+        var hullData = Context.GetData(entity.Hull) as HullData;
         AddSection(
             hullData.HullType == HullType.Ship ? "Ship" :
             hullData.HullType == HullType.Station ? "Station" :
@@ -356,162 +343,46 @@ public class PropertiesPanel : MonoBehaviour
         //AddList(hullData.Name).Inspect(hull, entity);
         //PropertiesPanel.AddProperty("Hull", () => $"{hullData.Name}");
         AddEntityProperties(entity);
-
-        var hardpointList = AddList("Gear");
-        hardpointList.InspectHardpoints(entity);
-        //hardpointList.SetExpanded(false,true);
-        
-        var cargoList = AddList("Cargo");
-	    cargoList.InspectCargo(entity);
         //cargoList.SetExpanded(false,true);
         
         RefreshValues();
 	}
 
-	public void InspectHardpoints(Entity entity)
-	{
-		RemoveListener();
-
-		ChangeSource = entity.GearEvent;
-		OnPropertiesChanged = InspectGearInternal;
-		ChangeSource.OnChanged += OnPropertiesChanged;
-		if (this is PropertiesList list)
-		{
-			if (list.Expanded)
-				InspectGearInternal();
-			else
-				list.OnExpand += b =>
-				{
-					if (b) InspectGearInternal();
-				};
-		}
-		else
-			InspectGearInternal();
-
-		void InspectGearInternal()
-		{
-			Clear();
-			var equippedItems = entity.Hardpoints.Where(hp => hp.Gear != null);
-			foreach (var hardpoint in equippedItems)
-			{
-				var propertyList = AddList(hardpoint.Gear.Name);
-				propertyList.Inspect(entity, hardpoint);
-				//propertyList.SetExpanded(false,true);
-			}
-			RefreshValues();
-		}
-	}
-
-	public void InspectCargo(Entity entity)
-	{
-		RemoveListener();
-
-		ChangeSource = entity.CargoEvent;
-		OnPropertiesChanged = InspectCargoInternal;
-		ChangeSource.OnChanged += OnPropertiesChanged;
-		if (this is PropertiesList list)
-		{
-			if (list.Expanded)
-				InspectCargoInternal();
-			else
-				list.OnExpand += b =>
-				{
-					if (b) InspectCargoInternal();
-				};
-		}
-		else
-			InspectCargoInternal();
-		
-		void InspectCargoInternal()
-		{
-			Clear();
-			foreach (var itemID in entity.Cargo.Where(id => Context.Cache.Get<ItemInstance>(id) is SimpleCommodity))
-			{
-				var simpleCommodity = Context.Cache.Get<SimpleCommodity>(itemID);
-				var data = simpleCommodity.ItemData;
-				var propertiesList = AddList($"{simpleCommodity.Quantity.ToString()} {data.Name}");
-				propertiesList.AddItemProperties(entity, simpleCommodity);
-				propertiesList.RefreshValues();
-				//propertiesList.SetExpanded(false, true);
-			}
-
-			foreach (var group in entity.Cargo
-				.Select(id => Context.Cache.Get<ItemInstance>(id))
-				.Where(item => item is CraftedItemInstance)
-				.Cast<CraftedItemInstance>()
-				.GroupBy(craftedItem => 
-				{
-					var corp = "GameCult";
-					if (craftedItem.SourceEntity != Guid.Empty)
-						corp = Context.Cache.Get<Corporation>(Context.Cache.Get<Entity>(craftedItem.SourceEntity).Corporation).Name;
-					return (craftedItem.Data, craftedItem.Name, corp);
-				}))
-			{
-				if (group.Count() == 1)
-				{
-					var item = group.First();
-					var propertiesList = AddList(item.Name);
-					propertiesList.AddItemProperties(entity, item);
-					propertiesList.RefreshValues();
-					//propertiesList.SetExpanded(false, true);
-				}
-				else
-				{
-					var instanceList = AddList($"{group.Count().ToString()} {group.Key.Name}");
-					instanceList.OnExpand += b =>
-					{
-						if (!b || instanceList.Children > 0) return;
-						foreach (var item in group)
-						{
-							var propertiesList = instanceList.AddList(item.Name);
-							propertiesList.AddItemProperties(entity, item);
-							propertiesList.RefreshValues();
-						}
-					};
-				}
-			}
-
-			RefreshValues();
-		}
-	}
-
 	public void AddEntityProperties(Entity entity)
 	{
 		AddField("Name", () => entity.Name, name => entity.Name = name);
-		AddProperty("Capacity", () => $"{entity.OccupiedCapacity}/{entity.Capacity:0}");
-		AddProperty("Mass", () => $"{entity.Mass.SignificantDigits(Context.GlobalData.SignificantDigits)}");
-		AddProperty("Temperature", () => $"{entity.Temperature:0}°K");
-		AddProperty("Energy", () => $"{entity.Energy:0}/{entity.GetBehavior<Reactor>()?.Capacitance??0:0}");
+		AddProperty("Mass", () => $"{entity.Mass.SignificantDigits(Context.GameplaySettings.SignificantDigits)}");
+		// AddProperty("Temperature", () => $"{entity.Temperature:0}°K");
+		// AddProperty("Energy", () => $"{entity.Energy:0}/{entity.GetBehavior<Reactor>()?.Capacitance??0:0}");
 	}
 
 	public void AddItemProperties(Entity entity, ItemInstance item)
 	{
-		var data = Context.Cache.Get<ItemData>(item.Data);
+		var data = Context.ItemData.Get<ItemData>(item.Data);
 		AddProperty("Type", () => data.Name);
 		AddProperty(data.Description).Label.fontStyle = FontStyles.Normal;
-		if (item is CraftedItemInstance craftedItemInstance)
-		{
-			var sourceEntity = Context.Cache.Get<Entity>(craftedItemInstance.SourceEntity);
-			if (sourceEntity != null)
-			{
-				var corporation = Context.Cache.Get<Corporation>(sourceEntity.Corporation);
-				AddProperty("Manufacturer", () => corporation.Name);
-			}
-			else
-			{
-				AddProperty("Manufacturer", () => "GameCult");
-			}
-		}
+		// if (item is CraftedItemInstance craftedItemInstance)
+		// {
+		// 	var sourceEntity = Context.ItemData.Get<Entity>(craftedItemInstance.SourceEntity);
+		// 	if (sourceEntity != null)
+		// 	{
+		// 		var corporation = Context.ItemData.Get<Corporation>(sourceEntity.Corporation);
+		// 		AddProperty("Manufacturer", () => corporation.Name);
+		// 	}
+		// 	else
+		// 	{
+		// 		AddProperty("Manufacturer", () => "GameCult");
+		// 	}
+		// }
 		if (item is SimpleCommodity simpleCommodity)
 			AddProperty("Quantity", () => simpleCommodity.Quantity.ToString());
-		AddProperty("Mass", () => item.Mass.SignificantDigits(Context.GlobalData.SignificantDigits));
-		AddProperty("Thermal Mass", () => item.ThermalMass.SignificantDigits(Context.GlobalData.SignificantDigits));
-		AddProperty("Size", () => item.Size.SignificantDigits(Context.GlobalData.SignificantDigits));
-		if (item is Gear gear)
+		AddProperty("Mass", () => Context.GetMass(item).SignificantDigits(Context.GameplaySettings.SignificantDigits));
+		AddProperty("Thermal Mass", () => Context.GetThermalMass(item).SignificantDigits(Context.GameplaySettings.SignificantDigits));
+		if (item is EquippableItem gear)
 		{
-			var gearData = gear.ItemData;
+			var gearData = Context.GetData(gear);
 			AddProperty("Durability", () =>
-				$"{gear.Durability.SignificantDigits(Context.GlobalData.SignificantDigits)}/{Context.Evaluate(gearData.Durability, gear).SignificantDigits(Context.GlobalData.SignificantDigits)}");
+				$"{gear.Durability.SignificantDigits(Context.GameplaySettings.SignificantDigits)}/{gearData.Durability.SignificantDigits(Context.GameplaySettings.SignificantDigits)}");
 			foreach (var behavior in gearData.Behaviors)
 			{
 				var type = behavior.GetType();
@@ -521,13 +392,13 @@ public class PropertiesPanel : MonoBehaviour
 					{
 						var fieldType = field.FieldType;
 						if (fieldType == typeof(float))
-							AddProperty(field.Name, () => $"{((float) field.GetValue(behavior)).SignificantDigits(Context.GlobalData.SignificantDigits)}");
+							AddProperty(field.Name, () => $"{((float) field.GetValue(behavior)).SignificantDigits(Context.GameplaySettings.SignificantDigits)}");
 						else if (fieldType == typeof(int))
 							AddProperty(field.Name, () => $"{(int) field.GetValue(behavior)}");
 						else if (fieldType == typeof(PerformanceStat))
 						{
 							var stat = (PerformanceStat) field.GetValue(behavior);
-							AddProperty(field.Name, () => $"{Context.Evaluate(stat, gear, entity).SignificantDigits(Context.GlobalData.SignificantDigits)}");
+							AddProperty(field.Name, () => $"{Context.Evaluate(stat, gear, entity).SignificantDigits(Context.GameplaySettings.SignificantDigits)}");
 						}
 					}
 				}
@@ -535,35 +406,8 @@ public class PropertiesPanel : MonoBehaviour
 		}
 	}
 
-	public void InspectChildren(Entity entity, Action<Entity> onSelect)
+	public void Inspect(Entity entity, EquippedItem item)
 	{
-		RemoveListener();
-
-		ChangeSource = entity.ChildEvent;
-		OnPropertiesChanged = InspectChildrenInternal;
-		ChangeSource.OnChanged += OnPropertiesChanged;
-		InspectChildrenInternal();
-
-		void InspectChildrenInternal()
-		{
-			Clear();
-			foreach (var child in entity.Children)
-			{
-				var childEntity = Context.Cache.Get<Entity>(child);
-				AddProperty(childEntity.Name, null, data => onSelect(childEntity), true);
-			}
-		}
-	}
-
-	public void Inspect(Entity entity, Hardpoint hardpoint)
-	{
-		RemoveListener();
-
-		ChangeSource = hardpoint.Gear;
-		if (ChangeSource == null)
-			return;
-		OnPropertiesChanged = InspectGearInternal;
-		ChangeSource.OnChanged += OnPropertiesChanged;
 		if (this is PropertiesList list)
 		{
 			if (list.Expanded)
@@ -581,10 +425,10 @@ public class PropertiesPanel : MonoBehaviour
 		{
 			//Debug.Log($"Refreshing {hardpoint.Gear.Name} properties");
 			Clear();
-			if (hardpoint.Gear != null)
+			if (item.EquippableItem != null)
 			{
-				AddItemProperties(entity, hardpoint.Gear);
-		        foreach (var behavior in hardpoint.Behaviors)
+				AddItemProperties(entity, item.EquippableItem);
+		        foreach (var behavior in item.Behaviors)
 		        {
 			        if(behavior is IPopulationAssignment populationAssignment)
 				        AddIncrementField("Assigned Population", 
@@ -593,53 +437,53 @@ public class PropertiesPanel : MonoBehaviour
 					        () => 0, () => entity.Population - entity.AssignedPopulation + populationAssignment.AssignedPopulation);
 			        if (behavior is Thermotoggle thermotoggle)
 				        AddField("Target Temperature", () => thermotoggle.TargetTemperature, temp => thermotoggle.TargetTemperature = temp);
-		            if (behavior is Factory factory)
-		            {
-		                AddField("Production Quality", () => factory.ProductionQuality, f => factory.ProductionQuality = f, 0, 1);
-		                var corporation = Context.Cache.Get<Corporation>(entity.Corporation);
-		                var compatibleBlueprints = corporation.UnlockedBlueprints
-		                    .Select(id => Context.Cache.Get<BlueprintData>(id))
-		                    .Where(bp => bp.FactoryItem == hardpoint.ItemData.ID).ToList();
-		                if (factory.RetoolingTime > 0)
-		                {
-		                    AddProgressField("Retooling", () => (factory.ToolingTime - (float) factory.RetoolingTime) / factory.ToolingTime);
-		                }
-		                else
-		                {
-		                    AddField("Item", 
-		                        () => compatibleBlueprints.FindIndex(bp=>bp.ID== factory.Blueprint) + 1, 
-		                        i => factory.Blueprint = i == 0 ? Guid.Empty : compatibleBlueprints[i - 1].ID,
-		                        new []{"None"}.Concat(compatibleBlueprints.Select(bp=>bp.Name)).ToArray());
-		                    AddField("Active", () => factory.Active, active => factory.Active = active);
-		                    if (factory.Blueprint != Guid.Empty)
-		                    {
-		                        if (factory.Active && factory.ItemUnderConstruction != Guid.Empty)
-		                        {
-		                            AddProgressField("Production", () =>
-		                            {
-			                            if (factory.ItemUnderConstruction == Guid.Empty) return 1;
-			                            var itemInstance = Context.Cache.Get<CraftedItemInstance>(factory.ItemUnderConstruction);
-			                            var blueprintData = Context.Cache.Get<BlueprintData>(itemInstance.Blueprint);
-			                            return (blueprintData.ProductionTime - (float) entity.IncompleteCargo[factory.ItemUnderConstruction]) / blueprintData.ProductionTime;
-		                            });
-		                        }
-		                        else
-		                        {
-			                        //AddField("Product Name", () => factory.ItemName, name => factory.ItemName = name);
-			                        AddField("Product Name", () => factory.ItemName, name => factory.ItemName = name);
-		                            var ingredientsList = AddList("Ingredients Needed");
-		                            var blueprintData = Context.Cache.Get<BlueprintData>(factory.Blueprint);
-		                            foreach (var ingredient in blueprintData.Ingredients)
-		                            {
-		                                var itemData = Context.Cache.Get<ItemData>(ingredient.Key);
-		                                ingredientsList.AddProperty(itemData.Name, () => ingredient.Value.ToString());
-		                            }
-		                            // ingredientsList.SetExpanded(false, true);
-		                            ingredientsList.RefreshValues();
-		                        }
-		                    }
-		                }
-		            }
+		            // if (behavior is Factory factory)
+		            // {
+		            //     AddField("Production Quality", () => factory.ProductionQuality, f => factory.ProductionQuality = f, 0, 1);
+		            //     var corporation = Context.ItemData.Get<Corporation>(entity.Corporation);
+		            //     var compatibleBlueprints = corporation.UnlockedBlueprints
+		            //         .Select(id => Context.ItemData.Get<BlueprintData>(id))
+		            //         .Where(bp => bp.FactoryItem == item.ItemData.ID).ToList();
+		            //     if (factory.RetoolingTime > 0)
+		            //     {
+		            //         AddProgressField("Retooling", () => (factory.ToolingTime - (float) factory.RetoolingTime) / factory.ToolingTime);
+		            //     }
+		            //     else
+		            //     {
+		            //         AddField("Item", 
+		            //             () => compatibleBlueprints.FindIndex(bp=>bp.ID== factory.Blueprint) + 1, 
+		            //             i => factory.Blueprint = i == 0 ? Guid.Empty : compatibleBlueprints[i - 1].ID,
+		            //             new []{"None"}.Concat(compatibleBlueprints.Select(bp=>bp.Name)).ToArray());
+		            //         AddField("Active", () => factory.Active, active => factory.Active = active);
+		            //         if (factory.Blueprint != Guid.Empty)
+		            //         {
+		            //             if (factory.Active && factory.ItemUnderConstruction != Guid.Empty)
+		            //             {
+		            //                 AddProgressField("Production", () =>
+		            //                 {
+			           //                  if (factory.ItemUnderConstruction == Guid.Empty) return 1;
+			           //                  var itemInstance = Context.ItemData.Get<CraftedItemInstance>(factory.ItemUnderConstruction);
+			           //                  var blueprintData = Context.ItemData.Get<BlueprintData>(itemInstance.Blueprint);
+			           //                  return (blueprintData.ProductionTime - (float) entity.IncompleteCargo[factory.ItemUnderConstruction]) / blueprintData.ProductionTime;
+		            //                 });
+		            //             }
+		            //             else
+		            //             {
+			           //              //AddField("Product Name", () => factory.ItemName, name => factory.ItemName = name);
+			           //              AddField("Product Name", () => factory.ItemName, name => factory.ItemName = name);
+		            //                 var ingredientsList = AddList("Ingredients Needed");
+		            //                 var blueprintData = Context.ItemData.Get<BlueprintData>(factory.Blueprint);
+		            //                 foreach (var ingredient in blueprintData.Ingredients)
+		            //                 {
+		            //                     var itemData = Context.ItemData.Get<ItemData>(ingredient.Key);
+		            //                     ingredientsList.AddProperty(itemData.Name, () => ingredient.Value.ToString());
+		            //                 }
+		            //                 // ingredientsList.SetExpanded(false, true);
+		            //                 ingredientsList.RefreshValues();
+		            //             }
+		            //         }
+		            //     }
+		            // }
 		        }
 			}
 			RefreshValues();
diff --git a/Assets/Scripts/UnityExtensions.cs b/Assets/Scripts/UnityExtensions.cs
index 1c16398ca..826712544 100644
--- a/Assets/Scripts/UnityExtensions.cs
+++ b/Assets/Scripts/UnityExtensions.cs
@@ -101,10 +101,12 @@ public static class UnityExtensions
 		var grad = new Gradient();
 		grad.mode = sharp ? GradientMode.Fixed : GradientMode.Blend;
 		grad.alphaKeys = new[] {new GradientAlphaKey(1, 0), new GradientAlphaKey(1, 1)};
-		grad.colorKeys = keys.Select(k => new GradientColorKey(k.xyz, k.w)).ToArray();
+		grad.colorKeys = keys.Select(k => new GradientColorKey(k.xyz.ToColor(), k.w)).ToArray();
 		return grad;
 	}
 	
+	public static Color ToColor(this float3 v) => new Color(v.x,v.y,v.z);
+	
 	public static Vector3 Flatland(this Vector2 v) => new Vector3(v.x,0,v.y);
 	public static Vector2 Flatland(this Vector3 v) => new Vector2(v.x,v.z);
 }
diff --git a/Assets/Shaders/ViewNormalEmissive.shader b/Assets/Shaders/ViewNormalEmissive.shader
new file mode 100644
index 000000000..5818a6302
--- /dev/null
+++ b/Assets/Shaders/ViewNormalEmissive.shader
@@ -0,0 +1,91 @@
+// Upgrade NOTE: upgraded instancing buffer 'Props' to new syntax.
+
+Shader "Aetheria/View Dependent Emissive" {
+	Properties {
+		_Color ("Color", Color) = (1,1,1,1)
+		_MainTex ("Albedo (RGB)", 2D) = "white" {}
+		_BumpMap ("Bumpmap", 2D) = "bump" {}
+		_BumpPower ("Bump Power", Range (0.01,5)) = 1
+		_Rotation ("Normal Rotation", Float) = 0
+		_Glossiness ("Smoothness", Range(0,1)) = 0.5
+		_MetallicGlossMap("Metallic", 2D) = "white" {}
+		_EmissionColor ("Emission Color", Color) = (1,1,1,1)
+		_Emission ("Emission Strength", Float) = 0
+        _EmissionFresnel ("Emission Fresnel", Float) = 1.0
+		_EmissionRoughnessFresnelPower("Emission Roughness Fresnel Power", Float) = 1.0
+		[MaterialToggle] _ReverseRim("ReverseRim", Float) = 0
+	}
+	SubShader {
+		Tags { "RenderType"="Opaque" }
+		LOD 200
+		
+		CGPROGRAM
+		// Physically based Standard lighting model, and enable shadows on all light types
+		#pragma surface surf Standard fullforwardshadows
+		//#pragma multi_compile REVERSE_RIM_ON REVERSE_RIM_OFF
+
+		// Use shader model 3.0 target, to get nicer looking lighting
+		#pragma target 3.0
+
+		sampler2D _MainTex;
+		sampler2D _BumpMap;
+		sampler2D _MetallicGlossMap;
+
+		struct Input {
+			float2 uv_MainTex;
+			float2 uv_BumpMap;
+			float3 viewDir;
+			float3 worldNormal; 
+			INTERNAL_DATA
+		};
+
+		half _Glossiness;
+		half _Metallic;
+		fixed4 _Color;
+		fixed4 _EmissionColor;
+		float _BumpPower;
+		float _Rotation;
+		float _Emission;
+        float _EmissionFresnel;
+        float _EmissionRoughnessFresnelPower;
+		half _ReverseRim;
+
+		// Add instancing support for this shader. You need to check 'Enable Instancing' on materials that use the shader.
+		// See https://docs.unity3d.com/Manual/GPUInstancing.html for more information about instancing.
+		// #pragma instancing_options assumeuniformscaling
+		UNITY_INSTANCING_BUFFER_START(Props)
+			// put more per-instance properties here
+		UNITY_INSTANCING_BUFFER_END(Props)
+
+		void surf (Input IN, inout SurfaceOutputStandard o) {
+			// Albedo comes from a texture tinted by color
+			fixed4 c = tex2D (_MainTex, IN.uv_MainTex) * _Color;
+			o.Albedo = c.rgb;
+
+            float sinX = sin ( _Rotation );
+            float cosX = cos ( _Rotation );
+            float sinY = sin ( _Rotation );
+            float2x2 rotationMatrix = float2x2( cosX, -sinX, sinY, cosX);
+
+			fixed3 normal = UnpackNormal(tex2D(_BumpMap, IN.uv_BumpMap));
+			normal.xy = mul ( normal.xy, rotationMatrix);
+			normal.z = normal.z / _BumpPower;
+			normal = normalize(normal);
+			o.Normal = normal;
+
+			// Metallic and smoothness come from a texture
+			float2 metalSmooth = tex2D (_MetallicGlossMap, IN.uv_MainTex).ra;
+			o.Metallic = metalSmooth.x;
+			o.Smoothness = metalSmooth.y * _Glossiness;
+
+			half rim = saturate(dot (normalize(IN.viewDir), o.Normal));
+			if(_ReverseRim > .5)
+				rim = 1 - rim;
+			o.Emission = _Emission * _EmissionColor * pow(rim,_EmissionFresnel / pow(metalSmooth.x, _EmissionRoughnessFresnelPower));
+
+			o.Alpha = c.a;
+		}
+		ENDCG
+	}
+	FallBack "Diffuse"
+}
diff --git a/Assets/Shaders/ViewNormalEmissive.shader.meta b/Assets/Shaders/ViewNormalEmissive.shader.meta
new file mode 100644
index 000000000..0ddf3162c
--- /dev/null
+++ b/Assets/Shaders/ViewNormalEmissive.shader.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: d69ef48273708ef4680762f5cdcfc860
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Economy.Shared.Unity.csproj b/Economy.Shared.Unity.csproj
index aea5af885..89dc5dc93 100644
--- a/Economy.Shared.Unity.csproj
+++ b/Economy.Shared.Unity.csproj
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Temp\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0169</NoWarn>
@@ -102,7 +102,6 @@
      <Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb.Driver\Generated\Ast\Update.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb.Driver\Generated\Ast\Slice.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb.Driver\Net\Converter.cs" />
-     <Compile Include="Assets\Scripts\ServerShared\IChangeSource.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb.Driver\Generated\ReqlCompileError.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb.Driver.Linq\WhereClauseParsers\IWhereClauseParser.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\LiteNetLib\NetSocket.cs" />
@@ -165,7 +164,7 @@
      <Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb.Driver\Generated\Proto\Protocol.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb.Driver\Generated\Ast\Random.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb.Driver\Ast\TopLevel.cs" />
-     <Compile Include="Assets\Scripts\ServerShared\GameContext.cs" />
+     <Compile Include="Assets\Scripts\ServerShared\ItemManager.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb.Driver\Generated\Proto\FrameType.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb.Driver\Generated\ReqlInternalError.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb.Driver\Generated\Ast\Iso8601.cs" />
@@ -511,6 +510,7 @@
      <Compile Include="Assets\Scripts\ServerShared\Agents\Mining.cs" />
      <Compile Include="Assets\Scripts\ServerShared\ZoneData.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\LinqFaster\Max.cs" />
+     <Compile Include="Assets\Scripts\ServerShared\Agents\WanderTask.cs" />
      <None Include="Assets\Scripts\ServerShared\NIH\LinqFaster\readme.txt" />
      <None Include="Assets\Scripts\ServerShared\Economy.Shared.Unity.asmdef" />
  <Reference Include="Unity.Mathematics">
@@ -552,6 +552,15 @@
  <Reference Include="Grpc.Core.Api">
  <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Editor">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
+ </Reference>
+ <Reference Include="Substance.Game">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.dll</HintPath>
+ </Reference>
+ <Reference Include="SourceUnityLib">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ </Reference>
  <Reference Include="mscorlib">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
  </Reference>
diff --git a/GameData/Home.zone b/GameData/Home.zone
new file mode 100644
index 000000000..ce400356b
Binary files /dev/null and b/GameData/Home.zone differ
diff --git a/MessagePack.csproj b/MessagePack.csproj
index 033d19eca..5077d4b10 100644
--- a/MessagePack.csproj
+++ b/MessagePack.csproj
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Temp\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0169</NoWarn>
@@ -388,6 +388,15 @@
  <Reference Include="Grpc.Core.Api">
  <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Editor">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
+ </Reference>
+ <Reference Include="Substance.Game">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.dll</HintPath>
+ </Reference>
+ <Reference Include="SourceUnityLib">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ </Reference>
  <Reference Include="mscorlib">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
  </Reference>
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 45b32e385..fdea4a669 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "com.alelievr.node-graph-processor": "file:D:/WIP4/Projects/NodeGraphProcessor/Assets/com.alelievr.NodeGraphProcessor",
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
     "com.unity.cinemachine": "2.6.3",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 7e2db5c52..9ea40bb44 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,11 +1,5 @@
 {
   "dependencies": {
-    "com.alelievr.node-graph-processor": {
-      "version": "file:D:/WIP4/Projects/NodeGraphProcessor/Assets/com.alelievr.NodeGraphProcessor",
-      "depth": 0,
-      "source": "local",
-      "dependencies": {}
-    },
     "com.unity.2d.sprite": {
       "version": "1.0.0",
       "depth": 0,
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 3105aff46..1871c5083 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5242276260f2126bc2e0ee25c1baaf2b58c777e82372a4a65219a56d83a0d19
-size 18926
+oid sha256:fd2a6b04790b18be3a482dc80d3f0b5919fe21fe94a3a87fb11454410b71fed9
+size 18951
diff --git a/ProjectSettings/ProjectVersionPrevious.txt b/ProjectSettings/ProjectVersionPrevious.txt
new file mode 100644
index 000000000..9d999024e
--- /dev/null
+++ b/ProjectSettings/ProjectVersionPrevious.txt
@@ -0,0 +1,2 @@
+m_EditorVersion: 2020.1.6f1
+m_EditorVersionWithRevision: 2020.1.6f1 (fc477ca6df10)
diff --git a/com.alelievr.NodeGraphProcessor.Runtime.csproj b/Substance.EditorHelper.csproj
similarity index 92%
rename from com.alelievr.NodeGraphProcessor.Runtime.csproj
rename to Substance.EditorHelper.csproj
index 086b583fc..3ce31600f 100644
--- a/com.alelievr.NodeGraphProcessor.Runtime.csproj
+++ b/Substance.EditorHelper.csproj
@@ -12,10 +12,10 @@
     <ProductVersion>10.0.20506</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <RootNamespace></RootNamespace>
-    <ProjectGuid>{4cc9ece5-0f74-bceb-733d-48f6e84c547b}</ProjectGuid>
+    <ProjectGuid>{dd909206-f54e-1c12-ed74-b4e22d464f6a}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <AssemblyName>com.alelievr.NodeGraphProcessor.Runtime</AssemblyName>
+    <AssemblyName>Substance.EditorHelper</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <BaseDirectory>.</BaseDirectory>
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Temp\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0169</NoWarn>
@@ -50,32 +50,8 @@
     <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
   </PropertyGroup>
   <ItemGroup>
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Utils\GraphUtils.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Utils\JsonSerializer.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Elements\Group.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Processing\CustomPortIO.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Utils\ExceptionToLog.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Utils\SerializableEdge.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Processing\ProcessGraphProcessor.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Elements\RelayNode.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Graph\BaseGraph.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Utils\MessageType.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Utils\SerrializableObject.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Processing\TypeAdapter.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Processing\BaseGraphProcessor.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Elements\BaseNode.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Graph\Attributes.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Utils\TypeExtension.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Utils\AppDomainExtension.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Elements\StickyNote.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Processing\JobGraphProcessor.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Elements\ParameterNode.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Elements\BaseStackNode.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Elements\PinnedElement.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Elements\NodePort.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\PackageInfo.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\Utils\SerializableType.cs" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Runtime\com.alelievr.NodeGraphProcessor.Runtime.asmdef" />
+     <Compile Include="Assets\Allegorithmic\Plugins\Substance.EditorHelper\Scripter.cs" />
+     <None Include="Assets\Allegorithmic\Plugins\Substance.EditorHelper\Substance.EditorHelper.asmdef" />
  <Reference Include="UnityEditor.UI">
  <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
  </Reference>
@@ -316,6 +292,15 @@
  <Reference Include="Grpc.Core.Api">
  <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Editor">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
+ </Reference>
+ <Reference Include="Substance.Game">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.dll</HintPath>
+ </Reference>
+ <Reference Include="SourceUnityLib">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ </Reference>
  <Reference Include="mscorlib">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
  </Reference>
diff --git a/com.alelievr.NodeGraphProcessor.Editor.csproj b/Substance.Platform.csproj
similarity index 85%
rename from com.alelievr.NodeGraphProcessor.Editor.csproj
rename to Substance.Platform.csproj
index e88bc03df..8f60d590b 100644
--- a/com.alelievr.NodeGraphProcessor.Editor.csproj
+++ b/Substance.Platform.csproj
@@ -12,10 +12,10 @@
     <ProductVersion>10.0.20506</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <RootNamespace></RootNamespace>
-    <ProjectGuid>{a4e83803-35fe-e54d-5974-2af6595e46a5}</ProjectGuid>
+    <ProjectGuid>{2ca9591a-f6e2-fafd-e598-0f0563c5ae57}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <AssemblyName>com.alelievr.NodeGraphProcessor.Editor</AssemblyName>
+    <AssemblyName>Substance.Platform</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <BaseDirectory>.</BaseDirectory>
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Temp\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0169</NoWarn>
@@ -50,66 +50,14 @@
     <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
   </PropertyGroup>
   <ItemGroup>
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\BaseGraphView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\PortView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\ParameterNodeView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\EditorAttributes.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Utils\BaseEdgeConnector.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\BaseGraphWindow.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Utils\NodeProvider.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\ProcessorView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\RelayNodeView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\CreateNodeMenuWindow.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\BaseStackNodeView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\ExposedParameterView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\StickyNoteView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\ExposedParameterPropertyView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\ExposedParameterFieldView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Utils\CopyPasteHelper.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\NodeInspectorObject.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\GraphInspector.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\NodeSettingsView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Utils\BaseEdgeDragHelper.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\ToolbarView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\MiniMapView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Callbacks\OnBaseGraphDeleted.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\EdgeView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\NodeBadgeView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Utils\StackNodeViewProvider.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\PinnedElementView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Logic\EdgeConnectorListener.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\GroupView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Utils\FieldFactory.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Views\BaseNodeView.cs" />
-     <Compile Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Callbacks\NodeGraphProcessorMenuItems.cs" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Resources\GraphProcessorStyles\GroupView.uss" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Resources\GraphProcessorElements\PinnedElement.uxml" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Resources\GraphProcessorStyles\NodeSettings.uss" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\com.alelievr.NodeGraphProcessor.Editor.asmdef" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Resources\GraphProcessorStyles\ExposedParameterView.uss" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Resources\UXML\NodeSettings.uxml" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Resources\GraphProcessorStyles\BaseGraphView.uss" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Resources\GraphProcessorStyles\InspectorView.uss" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Resources\GraphProcessorStyles\EdgeView.uss" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Resources\NodeTemplate.cs.txt" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Resources\GraphProcessorStyles\BaseNodeView.uss" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Resources\NodeViewTemplate.cs.txt" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Resources\GraphProcessorStyles\RelayNode.uss" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Resources\GraphProcessorStyles\BaseStackNodeView.uss" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Resources\GraphProcessorStyles\PinnedElementView.uss" />
-     <None Include="D:\WIP4\Projects\NodeGraphProcessor\Assets\com.alelievr.NodeGraphProcessor\Editor\Resources\GraphProcessorStyles\PortView.uss" />
+     <Compile Include="Assets\Allegorithmic\Plugins\Substance.Platform\NativeFunctions.cs" />
+     <None Include="Assets\Allegorithmic\Plugins\Substance.Platform\Substance.Platform.asmdef" />
  <Reference Include="UnityEditor.UI">
  <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.UI">
  <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
- <Reference Include="UnityEditor.TestRunner">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.TestRunner.dll</HintPath>
- </Reference>
- <Reference Include="UnityEngine.TestRunner">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.TestRunner.dll</HintPath>
- </Reference>
  <Reference Include="UnityEngine">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
  </Reference>
@@ -344,8 +292,14 @@
  <Reference Include="Grpc.Core.Api">
  <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll</HintPath>
  </Reference>
- <Reference Include="nunit.framework">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
+ <Reference Include="Substance.Editor">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
+ </Reference>
+ <Reference Include="Substance.Game">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.dll</HintPath>
+ </Reference>
+ <Reference Include="SourceUnityLib">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
  </Reference>
  <Reference Include="mscorlib">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
@@ -693,12 +647,6 @@
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll</HintPath>
  </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="com.alelievr.NodeGraphProcessor.Runtime.csproj">
-      <Project>{4cc9ece5-0f74-bceb-733d-48f6e84c547b}</Project>
-      <Name>com.alelievr.NodeGraphProcessor.Runtime</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/UniRx.csproj b/UniRx.csproj
index 22511c9d5..6a708d90d 100644
--- a/UniRx.csproj
+++ b/UniRx.csproj
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Temp\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_2020_1_6;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0169</NoWarn>
@@ -531,6 +531,15 @@
  <Reference Include="Grpc.Core.Api">
  <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Editor">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
+ </Reference>
+ <Reference Include="Substance.Game">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.dll</HintPath>
+ </Reference>
+ <Reference Include="SourceUnityLib">
+ <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ </Reference>
  <Reference Include="mscorlib">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
  </Reference>