diff --git a/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml b/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml
index a985199ea..82fdf9e8b 100644
--- a/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml
+++ b/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ContentModelStore">
     <e p="C:\Users\rwven\AppData\local\JetBrains\Rider2020.2\extResources" t="IncludeRecursive" />
-    <e p="C:\Users\rwven\AppData\local\JetBrains\Rider2020.2\resharper-host\local\Transient\Rider\v202\SolutionCaches\_Aetheria-Economy.1410242644.00" t="ExcludeRecursive" />
-    <e p="D:\WIP4\Projects\Aetheria-Economy" t="IncludeRecursive">
+    <e p="C:\Users\rwven\AppData\local\JetBrains\Rider2020.2\resharper-host\local\Transient\Rider\v202\SolutionCaches\_Aetheria-Economy.1645782805.00" t="ExcludeRecursive" />
+    <e p="E:\Projects\Aetheria-Economy" t="IncludeRecursive">
       <e p="Aetheria-Economy.sln" t="IncludeFlat" />
       <e p="Assembly-CSharp-Editor-firstpass.csproj" t="IncludeRecursive" />
       <e p="Assembly-CSharp-Editor.csproj" t="IncludeRecursive" />
diff --git a/.idea/.idea.Aetheria-Economy/.idea/indexLayout.xml b/.idea/.idea.Aetheria-Economy/.idea/indexLayout.xml
index 6b12b3c2e..763455528 100644
--- a/.idea/.idea.Aetheria-Economy/.idea/indexLayout.xml
+++ b/.idea/.idea.Aetheria-Economy/.idea/indexLayout.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ContentModelUserStore">
-    <attachedFolders />
+    <attachedFolders>
+      <Path>../NodeGraphProcessor/Assets/com.alelievr.NodeGraphProcessor</Path>
+    </attachedFolders>
     <explicitIncludes>
       <Path>Library/PackageCache/com.unity.cinemachine@2.6.3</Path>
       <Path>Library/PackageCache/com.unity.ext.nunit@1.0.0</Path>
@@ -21,7 +23,6 @@
       <Path>Library/PackageCache/com.unity.xr.legacyinputhelpers@2.1.4</Path>
       <Path>Packages</Path>
       <Path>ProjectSettings</Path>
-      <Path>../NodeGraphProcessor/Assets/com.alelievr.NodeGraphProcessor</Path>
     </explicitIncludes>
     <explicitExcludes>
       <Path>.git</Path>
@@ -35,6 +36,7 @@
       <Path>Logs</Path>
       <Path>Recordings</Path>
       <Path>Server</Path>
+      <Path>Temp</Path>
       <Path>UserSettings</Path>
       <Path>obj</Path>
     </explicitExcludes>
diff --git a/Assembly-CSharp-Editor-firstpass.csproj b/Assembly-CSharp-Editor-firstpass.csproj
index 3d6db1b77..bdafc9a64 100644
--- a/Assembly-CSharp-Editor-firstpass.csproj
+++ b/Assembly-CSharp-Editor-firstpass.csproj
@@ -55,85 +55,85 @@
      <Compile Include="Assets\Plugins\Celestial Body\Scripts\Editor\TextureCombinerEditor.cs" />
      <Compile Include="Assets\Plugins\Celestial Body\Scripts\Editor\GeneratorEditor.cs" />
  <Reference Include="UnityEditor.TestRunner">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.TestRunner.dll</HintPath>
+ <HintPath>E:/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>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.TestRunner.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Timeline.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Cinemachine">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Cinemachine.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Cinemachine.dll</HintPath>
  </Reference>
  <Reference Include="Unity.VSCode.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.InputSystem">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.InputSystem.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.InputSystem.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Recorder.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.TextMeshPro.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Recorder">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.UI">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Timeline">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Postprocessing.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Postprocessing.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Postprocessing.Editor.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.XR.LegacyInputHelpers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Rider.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Recorder.Base">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.Base.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.Base.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Mathematics">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Sprite.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Postprocessing.Runtime">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Postprocessing.Runtime.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Postprocessing.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Tilemap.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.SpatialTracking">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll</HintPath>
  </Reference>
  <Reference Include="com.unity.cinemachine.editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/com.unity.cinemachine.editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/com.unity.cinemachine.editor.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.SpatialTracking">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
  </Reference>
  <Reference Include="Unity.VisualStudio.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Mathematics.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.TextMeshPro">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.XR.LegacyInputHelpers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.UI">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
@@ -333,53 +333,53 @@
  <Reference Include="UnityEditor.WindowsStandalone.Extensions">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
  </Reference>
- <Reference Include="Microsoft.Extensions.Logging.Abstractions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.SqlServer.Types">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
- </Reference>
- <Reference Include="Newtonsoft.Json">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="QuickGraph">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
- </Reference>
- <Reference Include="Remotion.Linq">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Buffers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
- </Reference>
- <Reference Include="System.Memory">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
- </Reference>
- <Reference Include="System.Runtime.CompilerServices.Unsafe">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
- </Reference>
- <Reference Include="System.Threading.Tasks.Extensions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
- </Reference>
- <Reference Include="Google.Protobuf">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
- </Reference>
- <Reference Include="Grpc.Core">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
- </Reference>
- <Reference Include="Grpc.Core.Api">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll</HintPath>
+ <Reference Include="Substance.Game">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.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>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
  </Reference>
  <Reference Include="SourceUnityLib">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Extensions.Logging.Abstractions">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.SqlServer.Types">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
+ </Reference>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="QuickGraph">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
+ </Reference>
+ <Reference Include="Remotion.Linq">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Buffers">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Memory">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.CompilerServices.Unsafe">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading.Tasks.Extensions">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="Google.Protobuf">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core.Api">
+ <HintPath>E:/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>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.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>
@@ -736,22 +736,22 @@
       <Project>{c2362ba6-dee9-92b9-0779-f5fcf5968986}</Project>
       <Name>Economy.Shared.Unity</Name>
     </ProjectReference>
-    <ProjectReference Include="UniRx.csproj">
-      <Project>{4d885cb7-1f9e-abb3-b070-7265b432ecda}</Project>
-      <Name>UniRx</Name>
-    </ProjectReference>
-    <ProjectReference Include="MessagePack.csproj">
-      <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="UniRx.csproj">
+      <Project>{4d885cb7-1f9e-abb3-b070-7265b432ecda}</Project>
+      <Name>UniRx</Name>
+    </ProjectReference>
     <ProjectReference Include="Substance.Platform.csproj">
       <Project>{2ca9591a-f6e2-fafd-e598-0f0563c5ae57}</Project>
       <Name>Substance.Platform</Name>
     </ProjectReference>
+    <ProjectReference Include="MessagePack.csproj">
+      <Project>{c511ef21-dc27-883d-b027-9a4b6f36bae4}</Project>
+      <Name>MessagePack</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 8f3ebed69..3d69e8969 100644
--- a/Assembly-CSharp-Editor.csproj
+++ b/Assembly-CSharp-Editor.csproj
@@ -102,12 +102,12 @@
      <Compile Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Editor\CodeGeneration\NativePropertyDrawerDatabase.cs" />
      <Compile Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Editor\PropertyDrawers\ResizableTextAreaPropertyDrawer.cs" />
      <Compile Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Editor\CodeGeneration\PropertyMetaDatabase.cs" />
+     <Compile Include="Assets\Scripts\Editor\SpriteProcessor.cs" />
      <Compile Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Editor\PropertyValidators\MinValuePropertyValidator.cs" />
      <Compile Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Editor\PropertyValidators\ValidateInputPropertyValidator.cs" />
      <Compile Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Editor\NativePropertyDrawers\ShowNativePropertyNativePropertyDrawer.cs" />
      <Compile Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Editor\CodeGeneration\PropertyDrawConditionDatabase.cs" />
      <Compile Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Editor\PropertyMetas\OnValueChangedPropertyMeta.cs" />
-     <Compile Include="Assets\Scripts\Editor\SpriteProcessor.cs" />
      <None Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Editor\CodeGeneration\Templates\MethodDrawerDatabaseTemplate.txt" />
      <None Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Editor\CodeGeneration\Templates\PropertyValidatorDatabaseTemplate.txt" />
      <None Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Editor\CodeGeneration\Templates\PropertyDrawerDatabaseTemplate.txt" />
@@ -117,85 +117,85 @@
      <None Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Editor\CodeGeneration\Templates\PropertyMetaDatabaseTemplate.txt" />
      <None Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Editor\CodeGeneration\Templates\PropertyGrouperDatabaseTemplate.txt" />
  <Reference Include="UnityEditor.TestRunner">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.TestRunner.dll</HintPath>
+ <HintPath>E:/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>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.TestRunner.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Timeline.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Cinemachine">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Cinemachine.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Cinemachine.dll</HintPath>
  </Reference>
  <Reference Include="Unity.VSCode.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.InputSystem">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.InputSystem.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.InputSystem.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Recorder.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.TextMeshPro.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Recorder">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.UI">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Timeline">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Postprocessing.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Postprocessing.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Postprocessing.Editor.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.XR.LegacyInputHelpers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Rider.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Recorder.Base">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.Base.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.Base.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Mathematics">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Sprite.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Postprocessing.Runtime">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Postprocessing.Runtime.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Postprocessing.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Tilemap.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.SpatialTracking">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll</HintPath>
  </Reference>
  <Reference Include="com.unity.cinemachine.editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/com.unity.cinemachine.editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/com.unity.cinemachine.editor.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.SpatialTracking">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
  </Reference>
  <Reference Include="Unity.VisualStudio.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Mathematics.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.TextMeshPro">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.XR.LegacyInputHelpers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.UI">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
@@ -395,53 +395,53 @@
  <Reference Include="UnityEditor.WindowsStandalone.Extensions">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
  </Reference>
- <Reference Include="Microsoft.Extensions.Logging.Abstractions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.SqlServer.Types">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
- </Reference>
- <Reference Include="Newtonsoft.Json">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="QuickGraph">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
- </Reference>
- <Reference Include="Remotion.Linq">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Buffers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
- </Reference>
- <Reference Include="System.Memory">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
- </Reference>
- <Reference Include="System.Runtime.CompilerServices.Unsafe">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
- </Reference>
- <Reference Include="System.Threading.Tasks.Extensions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
- </Reference>
- <Reference Include="Google.Protobuf">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
- </Reference>
- <Reference Include="Grpc.Core">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
- </Reference>
- <Reference Include="Grpc.Core.Api">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll</HintPath>
+ <Reference Include="Substance.Game">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.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>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
  </Reference>
  <Reference Include="SourceUnityLib">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Extensions.Logging.Abstractions">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.SqlServer.Types">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
+ </Reference>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="QuickGraph">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
+ </Reference>
+ <Reference Include="Remotion.Linq">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Buffers">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Memory">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.CompilerServices.Unsafe">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading.Tasks.Extensions">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="Google.Protobuf">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core.Api">
+ <HintPath>E:/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>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.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>
@@ -806,22 +806,22 @@
       <Project>{c2362ba6-dee9-92b9-0779-f5fcf5968986}</Project>
       <Name>Economy.Shared.Unity</Name>
     </ProjectReference>
-    <ProjectReference Include="UniRx.csproj">
-      <Project>{4d885cb7-1f9e-abb3-b070-7265b432ecda}</Project>
-      <Name>UniRx</Name>
-    </ProjectReference>
-    <ProjectReference Include="MessagePack.csproj">
-      <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="UniRx.csproj">
+      <Project>{4d885cb7-1f9e-abb3-b070-7265b432ecda}</Project>
+      <Name>UniRx</Name>
+    </ProjectReference>
     <ProjectReference Include="Substance.Platform.csproj">
       <Project>{2ca9591a-f6e2-fafd-e598-0f0563c5ae57}</Project>
       <Name>Substance.Platform</Name>
     </ProjectReference>
+    <ProjectReference Include="MessagePack.csproj">
+      <Project>{c511ef21-dc27-883d-b027-9a4b6f36bae4}</Project>
+      <Name>MessagePack</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 fb9295b16..eaedf479b 100644
--- a/Assembly-CSharp-firstpass.csproj
+++ b/Assembly-CSharp-firstpass.csproj
@@ -130,79 +130,79 @@
      <None Include="Assets\Plugins\Celestial Body\Scripts\Shaders\Includes\Craters.cginc" />
      <None Include="Assets\Plugins\Celestial Body\Scripts\Shaders\Compute\Shading\MoonShading.compute" />
  <Reference Include="Unity.Timeline.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Cinemachine">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Cinemachine.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Cinemachine.dll</HintPath>
  </Reference>
  <Reference Include="Unity.VSCode.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.InputSystem">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.InputSystem.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.InputSystem.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Recorder.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.TextMeshPro.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Recorder">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.UI">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Timeline">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Postprocessing.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Postprocessing.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Postprocessing.Editor.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.XR.LegacyInputHelpers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Rider.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Recorder.Base">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.Base.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.Base.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Mathematics">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Sprite.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Postprocessing.Runtime">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Postprocessing.Runtime.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Postprocessing.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Tilemap.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.SpatialTracking">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll</HintPath>
  </Reference>
  <Reference Include="com.unity.cinemachine.editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/com.unity.cinemachine.editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/com.unity.cinemachine.editor.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.SpatialTracking">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
  </Reference>
  <Reference Include="Unity.VisualStudio.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Mathematics.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.TextMeshPro">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.XR.LegacyInputHelpers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.UI">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
@@ -393,44 +393,44 @@
  <Reference Include="UnityEditor">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/Managed/UnityEditor.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Game">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.dll</HintPath>
+ </Reference>
  <Reference Include="Microsoft.Extensions.Logging.Abstractions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
  </Reference>
  <Reference Include="Microsoft.SqlServer.Types">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
  </Reference>
  <Reference Include="Newtonsoft.Json">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
  </Reference>
  <Reference Include="QuickGraph">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
  </Reference>
  <Reference Include="Remotion.Linq">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
  </Reference>
  <Reference Include="System.Buffers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
  </Reference>
  <Reference Include="System.Memory">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
  </Reference>
  <Reference Include="System.Runtime.CompilerServices.Unsafe">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
  </Reference>
  <Reference Include="System.Threading.Tasks.Extensions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
  </Reference>
  <Reference Include="Google.Protobuf">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
  </Reference>
  <Reference Include="Grpc.Core">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
  </Reference>
  <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>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.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>
@@ -783,22 +783,22 @@
       <Project>{c2362ba6-dee9-92b9-0779-f5fcf5968986}</Project>
       <Name>Economy.Shared.Unity</Name>
     </ProjectReference>
-    <ProjectReference Include="UniRx.csproj">
-      <Project>{4d885cb7-1f9e-abb3-b070-7265b432ecda}</Project>
-      <Name>UniRx</Name>
-    </ProjectReference>
-    <ProjectReference Include="MessagePack.csproj">
-      <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="UniRx.csproj">
+      <Project>{4d885cb7-1f9e-abb3-b070-7265b432ecda}</Project>
+      <Name>UniRx</Name>
+    </ProjectReference>
     <ProjectReference Include="Substance.Platform.csproj">
       <Project>{2ca9591a-f6e2-fafd-e598-0f0563c5ae57}</Project>
       <Name>Substance.Platform</Name>
     </ProjectReference>
+    <ProjectReference Include="MessagePack.csproj">
+      <Project>{c511ef21-dc27-883d-b027-9a4b6f36bae4}</Project>
+      <Name>MessagePack</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 82495ca74..22a1f1ec3 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -74,6 +74,7 @@
      <Compile Include="Assets\Scripts\NIH\MSAGL\Miscellaneous\LayoutEditing\RestoreHelper.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Core\Geometry\Curves\LinearSystem2.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Rectilinear\ScanSegment.cs" />
+     <Compile Include="Assets\MapMenuInput.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Core\Geometry\OverlapRemoval\ConstraintGenerator.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Layout\Layered\Layering\NetworkSimplex.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Core\DataStructures\BinaryHeapWithComparer.cs" />
@@ -93,6 +94,7 @@
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Spline\ConeSpanner\LeftIntersectionEvent.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Rectilinear\PointComparer.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Layout\Layered\Ordering\ConstrainedOrderMeasure.cs" />
+     <Compile Include="Assets\MapRenderer.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Spline\Bundling\FlipSwitcher.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Core\Geometry\RectanglePacking\PackingConstants.cs" />
      <Compile Include="Assets\Scripts\UI\ClickRaycaster.cs" />
@@ -118,6 +120,7 @@
      <Compile Include="Assets\Scripts\NIH\MSAGL\Layout\Incremental\LockPosition.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\GraphmapsWithMesh\PointSet.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Layout\MDS\AllPairsDistances.cs" />
+     <Compile Include="Assets\Scripts\UI\PropertyButton.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Core\Geometry\SmoothedPolyline.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Core\ProjectionSolver\Constraint.cs" />
      <Compile Include="Assets\Scripts\NIH\MIConvexHull\Constants.cs" />
@@ -255,6 +258,7 @@
      <Compile Include="Assets\Scripts\NIH\MSAGL\Layout\Layered\HorizontalConstraintsForSugiyama.cs" />
      <Compile Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Core\DrawConditionAttributes\HideIfAttribute.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Miscellaneous\LayoutHelpers.cs" />
+     <Compile Include="Assets\FilterTest.cs" />
      <Compile Include="Assets\Scripts\CameraPerlinOrbit.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\ConstrainedDelaunayTriangulation\CdtTriangle.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Core\Layout\PortEntry.cs" />
@@ -324,6 +328,7 @@
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Spline\Bundling\CdtThreader.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Layout\LargeGraphLayout\IZoomLevelCalculator.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Spline\Bundling\BundleBase.cs" />
+     <Compile Include="Assets\MenuTabButton.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Miscellaneous\Constraints\AlignmentConstraint.cs" />
      <Compile Include="Assets\Scripts\Sector Display\SunObject.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Layout\LargeGraphLayout\LgSkeletonLevel.cs" />
@@ -356,6 +361,7 @@
      <Compile Include="Assets\Scripts\UI\MinimapCameraTrack.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Spline\ConeSpanner\ConeRightSide.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Core\Layout\ProximityOverlapRemoval\OverlapRemovalSettings.cs" />
+     <Compile Include="Assets\FitToCamera.cs" />
      <Compile Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Core\GroupAttributes\BoxGroupAttribute.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\GraphmapsWithMesh\Network.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Miscellaneous\Ranking\Centrality.cs" />
@@ -437,6 +443,7 @@
      <Compile Include="Assets\Scripts\NIH\MSAGL\Core\Layout\Arrowheads.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Miscellaneous\Phylo\PhyloTreeLayoutCalclulation.cs" />
      <Compile Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Core\ValidatorAttributes\ValidatorAttribute.cs" />
+     <Compile Include="Assets\InventoryMenu.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Core\Layout\IdealEdgeLengthSettings.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Rectilinear\Nudging\SpaceCalculationEvent.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Core\Layout\ProximityOverlapRemoval\MST\GTreeOverlapRemoval.cs" />
@@ -548,6 +555,7 @@
      <Compile Include="Assets\Scripts\NIH\MIConvexHull\Triangulation\VoronoiEdge.cs" />
      <Compile Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Core\NaughtyAttribute.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Core\DataStructures\GenericBinaryHeapPriorityQueueWithTimestamp.cs" />
+     <Compile Include="Assets\MenuPanel.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Rectilinear\Nudging\LinkedPoint.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Core\Geometry\MultidimensionalScaling.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Core\GraphAlgorithms\IEdge.cs" />
@@ -625,6 +633,7 @@
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Spline\Bundling\MetroGraphData.cs" />
      <Compile Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Core\DrawConditionAttributes\DrawConditionAttribute.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Rectilinear\LowBendVertexEvent.cs" />
+     <Compile Include="Assets\Scripts\UI\InventoryPanel.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Rectilinear\HighObstacleSide.cs" />
      <Compile Include="Assets\Scripts\NIH\NaughtyAttributes\Scripts\Core\ValidatorAttributes\MaxValueAttribute.cs" />
      <Compile Include="Assets\Scripts\NIH\MSAGL\Miscellaneous\MultiScale\MultiScaleLayout.cs" />
@@ -675,15 +684,6 @@
      <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" />
-     <Compile Include="Assets\Scripts\UI\InventoryPanel.cs" />
-     <Compile Include="Assets\Scripts\UI\PropertyButton.cs" />
-     <Compile Include="Assets\MenuPanel.cs" />
-     <Compile Include="Assets\MenuTabButton.cs" />
-     <Compile Include="Assets\InventoryMenu.cs" />
-     <Compile Include="Assets\FilterTest.cs" />
-     <Compile Include="Assets\MapRenderer.cs" />
-     <Compile Include="Assets\MapMenuInput.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" />
@@ -738,79 +738,79 @@
      <None Include="Assets\Shaders\Raymarching\VolumeSun.shader" />
      <None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_Sprite.shader" />
  <Reference Include="Unity.Timeline.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Cinemachine">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Cinemachine.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Cinemachine.dll</HintPath>
  </Reference>
  <Reference Include="Unity.VSCode.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.VSCode.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.InputSystem">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.InputSystem.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.InputSystem.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Recorder.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.TextMeshPro.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Recorder">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.UI">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Timeline">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Postprocessing.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Postprocessing.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Postprocessing.Editor.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.XR.LegacyInputHelpers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Rider.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Recorder.Base">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.Base.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Recorder.Base.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Mathematics">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Sprite.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Postprocessing.Runtime">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Postprocessing.Runtime.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Postprocessing.Runtime.dll</HintPath>
  </Reference>
  <Reference Include="Unity.2D.Tilemap.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.SpatialTracking">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll</HintPath>
  </Reference>
  <Reference Include="com.unity.cinemachine.editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/com.unity.cinemachine.editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/com.unity.cinemachine.editor.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine.SpatialTracking">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
  </Reference>
  <Reference Include="Unity.VisualStudio.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.Mathematics.Editor">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
  </Reference>
  <Reference Include="Unity.TextMeshPro">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.XR.LegacyInputHelpers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.UI">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
@@ -1001,44 +1001,44 @@
  <Reference Include="UnityEditor">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/Managed/UnityEditor.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Game">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.dll</HintPath>
+ </Reference>
  <Reference Include="Microsoft.Extensions.Logging.Abstractions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
  </Reference>
  <Reference Include="Microsoft.SqlServer.Types">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
  </Reference>
  <Reference Include="Newtonsoft.Json">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
  </Reference>
  <Reference Include="QuickGraph">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
  </Reference>
  <Reference Include="Remotion.Linq">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
  </Reference>
  <Reference Include="System.Buffers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
  </Reference>
  <Reference Include="System.Memory">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
  </Reference>
  <Reference Include="System.Runtime.CompilerServices.Unsafe">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
  </Reference>
  <Reference Include="System.Threading.Tasks.Extensions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
  </Reference>
  <Reference Include="Google.Protobuf">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
  </Reference>
  <Reference Include="Grpc.Core">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
  </Reference>
  <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>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.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>
@@ -1395,22 +1395,22 @@
       <Project>{c2362ba6-dee9-92b9-0779-f5fcf5968986}</Project>
       <Name>Economy.Shared.Unity</Name>
     </ProjectReference>
-    <ProjectReference Include="UniRx.csproj">
-      <Project>{4d885cb7-1f9e-abb3-b070-7265b432ecda}</Project>
-      <Name>UniRx</Name>
-    </ProjectReference>
-    <ProjectReference Include="MessagePack.csproj">
-      <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="UniRx.csproj">
+      <Project>{4d885cb7-1f9e-abb3-b070-7265b432ecda}</Project>
+      <Name>UniRx</Name>
+    </ProjectReference>
     <ProjectReference Include="Substance.Platform.csproj">
       <Project>{2ca9591a-f6e2-fafd-e598-0f0563c5ae57}</Project>
       <Name>Substance.Platform</Name>
     </ProjectReference>
+    <ProjectReference Include="MessagePack.csproj">
+      <Project>{c511ef21-dc27-883d-b027-9a4b6f36bae4}</Project>
+      <Name>MessagePack</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/Materials/UI/Map Gravity Lines.mat b/Assets/Materials/UI/Map Gravity Lines.mat
index 8e191ee8d..be7587308 100644
--- a/Assets/Materials/UI/Map Gravity Lines.mat	
+++ b/Assets/Materials/UI/Map Gravity Lines.mat	
@@ -82,7 +82,7 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Scale: 5.8510885
+    - _Scale: 1.7903528
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
diff --git a/Assets/Models/Zenith_Blender.fbx b/Assets/Models/Zenith_Blender.fbx
index 7d2a28a85..abbd6561c 100644
--- a/Assets/Models/Zenith_Blender.fbx
+++ b/Assets/Models/Zenith_Blender.fbx
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88e627ce02481cf4f5b29d41f9c8f8b229d287f6898490285571d55117be755b
-size 18335548
+oid sha256:bc766e0ec785d6963e1a7eaef16d4c4e6e571d46897e26244b6ce517c2745a35
+size 18335708
diff --git a/Assets/Prefabs/UI/Inventory.prefab b/Assets/Prefabs/UI/Inventory.prefab
index bf6365c85..e1507bdee 100644
--- a/Assets/Prefabs/UI/Inventory.prefab
+++ b/Assets/Prefabs/UI/Inventory.prefab
@@ -596,7 +596,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 2279630452912159028}
   m_HandleRect: {fileID: 2279630452912159027}
   m_Direction: 0
-  m_Value: 0
+  m_Value: 1
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -940,7 +940,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 78aa0b8ec7594a7438f13757228e3500, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  GameManager: {fileID: 0}
+  ContextMenu: {fileID: 0}
   Title: {fileID: 2279630453679143108}
+  Dropdown: {fileID: 8289855250608258092}
   Grid: {fileID: 2279630453710142156}
   NodeTextures:
   - {fileID: 447277437350272159, guid: ef4a863cd35ba454cb1d7e37e6388abe, type: 3}
diff --git a/Assets/Prefabs/UI/Property Button.prefab b/Assets/Prefabs/UI/Property Button.prefab
index 4e55ff1ef..25b923019 100644
--- a/Assets/Prefabs/UI/Property Button.prefab	
+++ b/Assets/Prefabs/UI/Property Button.prefab	
@@ -33,10 +33,10 @@ RectTransform:
   m_Father: {fileID: 1613450655389604793}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 192.5, y: -24.16}
+  m_SizeDelta: {x: 361, y: 36.32}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1613450655044732637
 CanvasRenderer:
@@ -170,7 +170,6 @@ GameObject:
   - component: {fileID: 496207392}
   - component: {fileID: 8328319666777474294}
   - component: {fileID: 4311087511401681413}
-  - component: {fileID: 528422172}
   - component: {fileID: 528422173}
   m_Layer: 5
   m_Name: Property Button
@@ -291,49 +290,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Label: {fileID: 1613450655044732626}
   Button: {fileID: 8328319666777474294}
---- !u!114 &528422172
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1613450655389604798}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 6683620520386570331}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!114 &528422173
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -347,7 +303,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Label: {fileID: 1613450655044732626}
-  Button: {fileID: 528422172}
+  Button: {fileID: 8328319666777474294}
 --- !u!1 &5811322450855121915
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/ARPG.unity b/Assets/Scenes/ARPG.unity
index f5d8c1abb..ba6d50932 100644
--- a/Assets/Scenes/ARPG.unity
+++ b/Assets/Scenes/ARPG.unity
@@ -1288,36 +1288,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 560317484512439620}
     m_Modifications:
-    - target: {fileID: 1613450655044732627, guid: 99bde06e2f0ca504bb95f2a4e3429462,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1613450655044732627, guid: 99bde06e2f0ca504bb95f2a4e3429462,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1613450655044732627, guid: 99bde06e2f0ca504bb95f2a4e3429462,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 192.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1613450655044732627, guid: 99bde06e2f0ca504bb95f2a4e3429462,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -24.16
-      objectReference: {fileID: 0}
-    - target: {fileID: 1613450655044732627, guid: 99bde06e2f0ca504bb95f2a4e3429462,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 361
-      objectReference: {fileID: 0}
-    - target: {fileID: 1613450655044732627, guid: 99bde06e2f0ca504bb95f2a4e3429462,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 36.32
-      objectReference: {fileID: 0}
     - target: {fileID: 1613450655389604793, guid: 99bde06e2f0ca504bb95f2a4e3429462,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -1525,7 +1495,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &346000247
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2688,7 +2658,7 @@ PrefabInstance:
     - target: {fileID: 2279630453886260052, guid: aac073da6df367d499834c926930dd84,
         type: 3}
       propertyPath: m_Name
-      value: Cargo
+      value: Cargo 1
       objectReference: {fileID: 0}
     - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84,
         type: 3}
@@ -2795,6 +2765,16 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
+    - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84,
+        type: 3}
+      propertyPath: GameManager
+      value: 
+      objectReference: {fileID: 1009503729}
+    - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84,
+        type: 3}
+      propertyPath: ContextMenu
+      value: 
+      objectReference: {fileID: 1157981993}
     - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -5280,7 +5260,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Canvas: {fileID: 761574180}
-  Root: {fileID: 0}
+  Root: {fileID: 761574181}
   CancelClickCatcher: {fileID: 1420548305}
   OptionPrefab: {fileID: 3523328438153607920, guid: 8cabdd9c2f8e4be45b917debb4762707,
     type: 3}
@@ -10055,7 +10035,7 @@ PrefabInstance:
     - target: {fileID: 2279630453886260052, guid: aac073da6df367d499834c926930dd84,
         type: 3}
       propertyPath: m_Name
-      value: Hull
+      value: Cargo 2
       objectReference: {fileID: 0}
     - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84,
         type: 3}
@@ -10162,6 +10142,16 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
+    - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84,
+        type: 3}
+      propertyPath: GameManager
+      value: 
+      objectReference: {fileID: 1009503729}
+    - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84,
+        type: 3}
+      propertyPath: ContextMenu
+      value: 
+      objectReference: {fileID: 1157981993}
     - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84,
         type: 3}
       propertyPath: m_AnchorMin.y
diff --git a/Assets/Scripts/ActionGameManager.cs b/Assets/Scripts/ActionGameManager.cs
index d41e8c721..90d11ead3 100644
--- a/Assets/Scripts/ActionGameManager.cs
+++ b/Assets/Scripts/ActionGameManager.cs
@@ -32,12 +32,14 @@ public class ActionGameManager : MonoBehaviour
     private float _time;
     private AetheriaInput _input;
     private int _zoomLevelIndex;
+    private Ship _currentShip;
     public List<Ship> PlayerShips { get; } = new List<Ship>();
     
     public DatabaseCache ItemData { get; private set; }
     public ItemManager ItemManager { get; private set; }
     public Zone Zone { get; private set; }
 
+
     void Start()
     {
         ConsoleController.MessageReceiver = this;
@@ -113,11 +115,17 @@ public class ActionGameManager : MonoBehaviour
         var stationOrbit = Zone.CreateOrbit(parentOrbit, stationPos);
         var station = new OrbitalEntity(ItemManager, Zone, stationHull, stationOrbit.ID);
         Zone.Entities.Add(station);
+        var dockingBayData = ItemData.GetAll<DockingBayData>().First();
+        var dockingBay = ItemManager.CreateInstance(dockingBayData, 1, 1) as EquippableItem;
+        station.TryEquip(dockingBay);
         
         var hullType = ItemData.GetAll<HullData>().First(x=>x.HullType==HullType.Ship);
         var shipHull = ItemManager.CreateInstance(hullType, 0, 1) as EquippableItem;
         var ship = new Ship(ItemManager, Zone, shipHull);
-        
+        PlayerShips.Add(ship);
+        _currentShip = ship;
+        station.TryDock(ship);
+
         // MapButton.onClick.AddListener(() =>
         // {
         //     if (_currentMenuTabButton == MapPanel) return;
@@ -138,6 +146,30 @@ public class ActionGameManager : MonoBehaviour
         FollowCamera.gameObject.SetActive(!_editMode);
         TopDownCamera.gameObject.SetActive(_editMode);
     }
+    
+    public IEnumerable<EquippedCargoBay> AvailableCargoBays()
+    {
+        if (_currentShip.Parent != null)
+        {
+            foreach (var bay in _currentShip.Parent.DockingBays)
+            {
+                if (PlayerShips.Contains(bay.DockedShip)) yield return bay;
+            }
+        }
+    }
+
+    public IEnumerable<Ship> AvailableShips()
+    {
+        if (_currentShip.Parent != null)
+        {
+            foreach (var ship in PlayerShips)
+            {
+                if (_currentShip.Parent.Children.Contains(ship)) yield return ship;
+            }
+        }
+        else 
+            yield return _currentShip;
+    }
 
     void Update()
     {
diff --git a/Assets/Scripts/Editor/DatabaseView.cs b/Assets/Scripts/Editor/DatabaseView.cs
index c0b6e1c72..a4b928758 100644
--- a/Assets/Scripts/Editor/DatabaseView.cs
+++ b/Assets/Scripts/Editor/DatabaseView.cs
@@ -242,9 +242,16 @@ public class DatabaseListView : EditorWindow
                     else if(_itemTypes[i] == typeof(CompoundCommodityData))
                         itemGroups = typedItems.GroupBy(item => Enum.GetName(typeof(CompoundCommodityCategory), (item as CompoundCommodityData).Category));
                     else if(_itemTypes[i] == typeof(GearData))
-                        itemGroups = typedItems.GroupBy(item => Enum.GetName(typeof(HardpointType), (item as GearData).Hardpoint));
-                    else if(_itemTypes[i] == typeof(HullData))
+                        itemGroups = typedItems.GroupBy(item =>
+                        {
+                            var hp = Enum.GetName(typeof(HardpointType), (item as GearData).Hardpoint);
+                            if (hp == null)
+                                hp = "Invalid Hardpoint";
+                            return hp;
+                        });
+                    else if (_itemTypes[i] == typeof(HullData))
                         itemGroups = typedItems.GroupBy(item => Enum.GetName(typeof(HullType), (item as HullData).HullType));
+                    else itemGroups = typedItems.GroupBy(item => "All");
 
                     foreach (var itemGroup in itemGroups)
                     {
diff --git a/Assets/Scripts/ServerShared/Behaviors/Controller.cs b/Assets/Scripts/ServerShared/Behaviors/Controller.cs
index b384d65db..5cabb2b80 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Controller.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Controller.cs
@@ -62,7 +62,7 @@ public abstract class ControllerBase<T> : IBehavior, IController<T>, IInitializa
         Entity = entity;
         _controllerData = data;
         CheckSpaceworthiness();
-        entity.EquippedItems.ObserveAdd().Subscribe(added => CheckSpaceworthiness());
+        entity.Equipment.ObserveAdd().Subscribe(added => CheckSpaceworthiness());
     }
 
     private void CheckSpaceworthiness()
diff --git a/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs b/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs
index c7503bb10..4ec387043 100644
--- a/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/StatModifier.cs
@@ -59,14 +59,14 @@ public class StatModifier : IBehavior, IInitializableBehavior, IDisposableBehavi
             if (statField != null)
             {
                 if (typeof(EquippableItemData).IsAssignableFrom(targetType))
-                    _stats = Entity.EquippedItems
+                    _stats = Entity.Equipment
                         .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.EquippedItems
+                    _stats = Entity.Equipment
                         .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)
diff --git a/Assets/Scripts/ServerShared/Entity.cs b/Assets/Scripts/ServerShared/Entity.cs
index aef779ffb..7a1b0848f 100644
--- a/Assets/Scripts/ServerShared/Entity.cs
+++ b/Assets/Scripts/ServerShared/Entity.cs
@@ -26,8 +26,9 @@ public abstract class Entity
     public float[,] Temperature;
     public float Energy;
 
-    public readonly ReactiveCollection<EquippedItem> EquippedItems = new ReactiveCollection<EquippedItem>();
-    public readonly ReactiveCollection<EquippedCargoBay> EquippedCargoBays = new ReactiveCollection<EquippedCargoBay>();
+    public readonly ReactiveCollection<EquippedItem> Equipment = new ReactiveCollection<EquippedItem>();
+    public readonly ReactiveCollection<EquippedCargoBay> CargoBays = new ReactiveCollection<EquippedCargoBay>();
+    public readonly ReactiveCollection<EquippedDockingBay> DockingBays = new ReactiveCollection<EquippedDockingBay>();
 
     public Entity Parent;
     public List<Entity> Children = new List<Entity>();
@@ -60,7 +61,7 @@ public abstract class Entity
             _active = value;
             if (_active)
             {
-                foreach (var hardpoint in EquippedItems)
+                foreach (var hardpoint in Equipment)
                     if(hardpoint.EquippableItem!=null)
                         foreach (var behavior in hardpoint.Behaviors)
                         {
@@ -76,6 +77,7 @@ public abstract class Entity
         ItemManager = itemManager;
         Zone = zone;
         Hull = hull;
+        Name = hull.Name;
         MapShip();
     }
 
@@ -129,7 +131,7 @@ public abstract class Entity
 
     public EquippedCargoBay FindItemInCargo(Guid itemDataID)
     {
-        return EquippedCargoBays.FirstOrDefault(c => c.ItemsOfType.ContainsKey(itemDataID));
+        return CargoBays.FirstOrDefault(c => c.ItemsOfType.ContainsKey(itemDataID));
     }
 
     // Attempts to move a given number of items of the given type to the target Entity
@@ -139,7 +141,7 @@ public abstract class Entity
         int quantityTransferred = 0;
         while (quantityTransferred < quantity)
         {
-            EquippedCargoBay originInventory = EquippedCargoBays.FirstOrDefault(c => c.ItemsOfType.ContainsKey(itemDataID));
+            EquippedCargoBay originInventory = CargoBays.FirstOrDefault(c => c.ItemsOfType.ContainsKey(itemDataID));
 
             if (originInventory == null) break;
 
@@ -148,7 +150,7 @@ public abstract class Entity
             if (itemInstance is SimpleCommodity simpleCommodity)
             {
                 var targetQuantity = min(simpleCommodity.Quantity, quantity - quantityTransferred);
-                if (!target.EquippedCargoBays.Any(c => originInventory.TryTransferItem(c, simpleCommodity, targetQuantity)))
+                if (!target.CargoBays.Any(c => originInventory.TryTransferItem(c, simpleCommodity, targetQuantity)))
                 {
                     quantityTransferred += targetQuantity - simpleCommodity.Quantity;
                     break;
@@ -158,7 +160,7 @@ public abstract class Entity
             }
             else if (itemInstance is CraftedItemInstance craftedItemInstance)
             {
-                if (!target.EquippedCargoBays.Any(c => originInventory.TryTransferItem(c, craftedItemInstance)))
+                if (!target.CargoBays.Any(c => originInventory.TryTransferItem(c, craftedItemInstance)))
                     break;
                 
                 quantityTransferred++;
@@ -184,10 +186,10 @@ public abstract class Entity
                 return null;
             }
 
-            EquippedCargoBays.Remove(cargoBay);
+            CargoBays.Remove(cargoBay);
         }
         
-        EquippedItems.Remove(item);
+        Equipment.Remove(item);
         
         var itemData = ItemManager.GetData(item.EquippableItem);
         foreach (var i in itemData.Shape.Coordinates)
@@ -308,13 +310,21 @@ public abstract class Entity
             EquippedItem equippedItem;
             if(itemData is CargoBayData)
             {
-                equippedItem = new EquippedCargoBay(ItemManager, item, hullCoord);
-                EquippedCargoBays.Add((EquippedCargoBay) equippedItem);
+                if (itemData is DockingBayData)
+                {
+                    equippedItem = new EquippedDockingBay(ItemManager, item, hullCoord, $"{Name} Docking Bay {DockingBays.Count + 1}");
+                    DockingBays.Add((EquippedDockingBay) equippedItem);
+                }
+                else
+                {
+                    equippedItem = new EquippedCargoBay(ItemManager, item, hullCoord, $"{Name} Cargo Bay {CargoBays.Count + 1}");
+                    CargoBays.Add((EquippedCargoBay) equippedItem);
+                }
             }
             else
             {
                 equippedItem = new EquippedItem(ItemManager, item, hullCoord);
-                EquippedItems.Add(equippedItem);
+                Equipment.Add(equippedItem);
             }
 
             foreach (var i in itemData.Shape.Coordinates)
@@ -329,7 +339,7 @@ public abstract class Entity
         else
         {
             var equippedItem = new EquippedItem(ItemManager, item, hullCoord);
-            EquippedItems.Add(equippedItem);
+            Equipment.Add(equippedItem);
             
             foreach (var i in itemData.Shape.Coordinates)
             {
@@ -340,7 +350,38 @@ public abstract class Entity
             Hydrate(equippedItem);
             return true;
         }
+    }
 
+    public EquippedDockingBay TryDock(Ship ship)
+    {
+        var bay = DockingBays.FirstOrDefault(x => x.DockedShip == null);
+        if (bay != null)
+        {
+            bay.DockedShip = ship;
+            ship.SetParent(this);
+            Zone.Entities.Remove(ship);
+        }
+
+        return bay;
+    }
+
+    public bool TryUndock(Ship ship)
+    {
+        var bay = DockingBays.FirstOrDefault(x => x.DockedShip == ship);
+        if (bay == null)
+        {
+            ItemManager.Log($"Ship {ship.Name} attempted to undock from {Name}, but it was not docked!");
+            return false;
+        }
+
+        if (bay.Cargo.Any())
+            return false;
+
+        bay.DockedShip = null;
+        ship.RemoveParent();
+        Zone.Entities.Add(ship);
+
+        return true;
     }
 
     public void AddChild(Entity entity)
@@ -372,7 +413,7 @@ public abstract class Entity
 
     public T GetBehavior<T>() where T : class, IBehavior
     {
-        foreach (var equippedItem in EquippedItems)
+        foreach (var equippedItem in Equipment)
             foreach (var behavior in equippedItem.Behaviors)
                 if (behavior is T b)
                     return b;
@@ -381,7 +422,7 @@ public abstract class Entity
 
     public IEnumerable<T> GetBehaviors<T>() where T : class, IBehavior
     {
-        foreach (var equippedItem in EquippedItems)
+        foreach (var equippedItem in Equipment)
             foreach (var behavior in equippedItem.Behaviors)
                 if (behavior is T b)
                     yield return b;
@@ -389,7 +430,7 @@ public abstract class Entity
 
     public IEnumerable<T> GetBehaviorData<T>() where T : BehaviorData
     {
-        foreach (var equippedItem in EquippedItems)
+        foreach (var equippedItem in Equipment)
             foreach (var behavior in equippedItem.Behaviors)
                 if (behavior.Data is T b)
                     yield return b;
@@ -397,7 +438,7 @@ public abstract class Entity
 
     public Switch GetSwitch<T>() where T : class, IBehavior
     {
-        foreach (var equippedItem in EquippedItems)
+        foreach (var equippedItem in Equipment)
             foreach (var group in equippedItem.BehaviorGroups)
                 foreach(var behavior in group.Behaviors)
                     if (behavior is T)
@@ -407,7 +448,7 @@ public abstract class Entity
 
     public Trigger GetTrigger<T>() where T : class, IBehavior
     {
-        foreach (var equippedItem in EquippedItems)
+        foreach (var equippedItem in Equipment)
             foreach (var group in equippedItem.BehaviorGroups)
                 foreach(var behavior in group.Behaviors)
                     if (behavior is T)
@@ -419,7 +460,7 @@ public abstract class Entity
     {
         if (Active)
         {
-            foreach (var equippedItem in EquippedItems)
+            foreach (var equippedItem in Equipment)
             {
                 equippedItem.Update(delta);
             }
@@ -534,10 +575,12 @@ public class EquippedCargoBay : EquippedItem
     
     public float Mass { get; private set; }
     public float ThermalMass { get; private set; }
+    public string Name { get; }
     
-    public EquippedCargoBay(ItemManager itemManager, EquippableItem item, int2 position) : base(itemManager, item, position)
+    public EquippedCargoBay(ItemManager itemManager, EquippableItem item, int2 position, string name) : base(itemManager, item, position)
     {
         Data = _itemManager.GetData(EquippableItem) as CargoBayData;
+        Name = name;
 
         Mass = Data.Mass;
         ThermalMass = Data.Mass * Data.SpecificHeat;
@@ -780,6 +823,17 @@ public class EquippedCargoBay : EquippedItem
     }
 }
 
+public class EquippedDockingBay : EquippedCargoBay
+{
+    public Ship DockedShip;
+    public int2 MaxSize => _data.MaxSize;
+    private DockingBayData _data;
+    public EquippedDockingBay(ItemManager itemManager, EquippableItem item, int2 position, string name) : base(itemManager, item, position, name)
+    {
+        _data = _itemManager.GetData(EquippableItem) as DockingBayData;
+    }
+}
+
 public class BehaviorGroup
 {
     public IBehavior[] Behaviors;
diff --git a/Assets/Scripts/ServerShared/ItemData.cs b/Assets/Scripts/ServerShared/ItemData.cs
index 65d45582b..92173b65e 100644
--- a/Assets/Scripts/ServerShared/ItemData.cs
+++ b/Assets/Scripts/ServerShared/ItemData.cs
@@ -270,7 +270,7 @@ public class CargoBayData : EquippableItemData
 [RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
 public class DockingBayData : CargoBayData
 {
-    [InspectableField, JsonProperty("maxSize"), Key(13)]
+    [InspectableField, JsonProperty("maxSize"), Key(14)]
     public int2 MaxSize;
     [IgnoreMember] public override HardpointType HardpointType => HardpointType.Tool;
 }
diff --git a/Assets/Scripts/UI/ContextMenu.cs b/Assets/Scripts/UI/ContextMenu.cs
index 9812ec322..6b1320cd0 100644
--- a/Assets/Scripts/UI/ContextMenu.cs
+++ b/Assets/Scripts/UI/ContextMenu.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using TMPro;
 using UnityEngine;
+using UnityEngine.InputSystem;
 using UnityEngine.UI;
 
 public class ContextMenu : MonoBehaviour
@@ -104,19 +105,21 @@ public class ContextMenu : MonoBehaviour
 
     public void Show()
     {
+        gameObject.SetActive(true);
         var rect = transform as RectTransform;
         var pivot = rect.pivot;
         var canvas = Parent != null ? Parent.Canvas : Canvas;
+        var mousePosition = Mouse.current.position.ReadValue();
         if (Parent!=null)
             pivot.x = ForceDirectionRight ? 0 : 1;
         else
-            pivot.x = Input.mousePosition.x > Screen.width - rect.sizeDelta.x * canvas.scaleFactor ? 1 : 0;
+            pivot.x = mousePosition.x > Screen.width - rect.sizeDelta.x * canvas.scaleFactor ? 1 : 0;
         var scaleFactor = canvas.scaleFactor;
-        _dropdownRight = Input.mousePosition.x < Screen.width - rect.sizeDelta.x * scaleFactor * 2;
-        var pivotTop = (Parent==null ? Input.mousePosition.y : ForcePosition.y) > (PaddingHeight + _options.Count * OptionHeight) * scaleFactor;
+        _dropdownRight = mousePosition.x < Screen.width - rect.sizeDelta.x * scaleFactor * 2;
+        var pivotTop = (Parent==null ? mousePosition.y : ForcePosition.y) > (PaddingHeight + _options.Count * OptionHeight) * scaleFactor;
         pivot.y = pivotTop ? 1 : 0;
         rect.pivot = pivot;
-        rect.position = Parent!=null ? ForcePosition - (pivotTop ? Vector3.zero : Vector3.up * (OptionHeight * scaleFactor)) : Input.mousePosition;
+        rect.position = Parent!=null ? ForcePosition - (pivotTop ? Vector3.zero : Vector3.up * (OptionHeight * scaleFactor)) : (Vector3)mousePosition;
         if (Parent==null)
             CancelClickCatcher.gameObject.SetActive(true);
     }
diff --git a/Assets/Scripts/UI/InventoryPanel.cs b/Assets/Scripts/UI/InventoryPanel.cs
index 56ee2e587..b70cb6592 100644
--- a/Assets/Scripts/UI/InventoryPanel.cs
+++ b/Assets/Scripts/UI/InventoryPanel.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using TMPro;
@@ -10,12 +11,15 @@ using int2 = Unity.Mathematics.int2;
 
 public class InventoryPanel : MonoBehaviour
 {
+    public ActionGameManager GameManager;
+    public ContextMenu ContextMenu;
     public TextMeshProUGUI Title;
+    public Button Dropdown;
     public GridLayoutGroup Grid;
     public Sprite[] NodeTextures;
     public Prototype NodePrototype;
 
-    private Dictionary<int2, GameObject> _nodeInstances;
+    private Dictionary<int2, GameObject> _nodeInstances = new Dictionary<int2, GameObject>();
     private int2[] _offsets = new[]
     {
         int2(0, 1),
@@ -28,8 +32,40 @@ public class InventoryPanel : MonoBehaviour
         int2(-1, 1)
     };
 
+    private void Start()
+    {
+        Dropdown.onClick.AddListener(() =>
+        {
+            ContextMenu.Clear();
+            foreach (var ship in GameManager.AvailableShips())
+            {
+                if (ship.CargoBays.Any())
+                {
+                    ContextMenu.AddDropdown(ship.Name,
+                        ship.CargoBays
+                            .Select<EquippedCargoBay, (string text, Action action, bool enabled)>((bay, index) =>
+                                ($"Bay {index}", () => Display(GameManager.ItemManager, bay), true))
+                            .Prepend(("Equipment", () => Display(GameManager.ItemManager, ship), true)));
+                }
+                else ContextMenu.AddOption(ship.Name, () => Display(GameManager.ItemManager, ship));
+            }
+
+            foreach (var bay in GameManager.AvailableCargoBays())
+            {
+                ContextMenu.AddOption(bay.Name, () => Display(GameManager.ItemManager, bay));
+            }
+            ContextMenu.Show();
+        });
+    }
+
     public void Display(ItemManager manager, Entity entity)
     {
+        foreach(var node in _nodeInstances.Values)
+            Destroy(node);
+        _nodeInstances.Clear();
+
+        Title.text = entity.Name;
+        
         var hullData = manager.GetData(entity.Hull) as HullData;
         Grid.constraintCount = hullData.Shape.Width;
         _nodeInstances = hullData.Shape.AllCoordinates
@@ -90,12 +126,18 @@ public class InventoryPanel : MonoBehaviour
 
     public void Display(ItemManager manager, EquippedCargoBay cargo)
     {
-        Grid.constraintCount = cargo.Data.Shape.Width;
-        _nodeInstances = cargo.Data.Shape.AllCoordinates
+        foreach(var node in _nodeInstances.Values)
+            Destroy(node);
+        _nodeInstances.Clear();
+
+        Title.text = cargo.Name;
+        
+        Grid.constraintCount = cargo.Data.InteriorShape.Width;
+        _nodeInstances = cargo.Data.InteriorShape.AllCoordinates
             .ToDictionary(v => v,
                 v =>
                 {
-                    if (!cargo.Data.Shape[v])
+                    if (!cargo.Data.InteriorShape[v])
                     {
                         var empty = new GameObject("Empty Node", typeof(RectTransform));
                         empty.transform.SetParent(Grid.transform);
@@ -106,7 +148,7 @@ public class InventoryPanel : MonoBehaviour
                     var item = cargo.Occupancy[v.x, v.y];
 
                     bool ItemMatch(int2 offset) => 
-                        !cargo.Data.Shape[v + offset] || 
+                        !cargo.Data.InteriorShape[v + offset] || 
                         item == null || 
                         cargo.Occupancy[v.x + offset.x, v.y + offset.y] != item;
                     
@@ -127,10 +169,9 @@ public class InventoryPanel : MonoBehaviour
                     var node = NodePrototype.Instantiate<Prototype>().gameObject;
                     var image = node.GetComponentInChildren<Image>();
                     image.sprite = NodeTextures[spriteIndex];
-                    var itemData = manager.GetData(item);
                     if (item == null)
                         image.color = Color.white * .5f;
-                    else if (itemData is EquippableItemData equippable)
+                    else if (manager.GetData(item) is EquippableItemData equippable)
                         image.color = HardpointData.GetColor(equippable.HardpointType).ToColor();
                     else
                         image.color = Color.white;
diff --git a/Economy.Shared.Unity.csproj b/Economy.Shared.Unity.csproj
index 89dc5dc93..3afc0e30f 100644
--- a/Economy.Shared.Unity.csproj
+++ b/Economy.Shared.Unity.csproj
@@ -165,6 +165,7 @@
      <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\ItemManager.cs" />
+     <Compile Include="Assets\Scripts\ServerShared\Agents\WanderTask.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" />
@@ -510,56 +511,55 @@
      <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">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.Extensions.Logging.Abstractions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.SqlServer.Types">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
- </Reference>
- <Reference Include="Newtonsoft.Json">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="QuickGraph">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
- </Reference>
- <Reference Include="Remotion.Linq">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Buffers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
- </Reference>
- <Reference Include="System.Memory">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
- </Reference>
- <Reference Include="System.Runtime.CompilerServices.Unsafe">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
- </Reference>
- <Reference Include="System.Threading.Tasks.Extensions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
- </Reference>
- <Reference Include="Google.Protobuf">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
- </Reference>
- <Reference Include="Grpc.Core">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
- </Reference>
- <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>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Mathematics.dll</HintPath>
  </Reference>
  <Reference Include="Substance.Game">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.dll</HintPath>
+ </Reference>
+ <Reference Include="Substance.Editor">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
  </Reference>
  <Reference Include="SourceUnityLib">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Extensions.Logging.Abstractions">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.SqlServer.Types">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
+ </Reference>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="QuickGraph">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
+ </Reference>
+ <Reference Include="Remotion.Linq">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Buffers">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Memory">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.CompilerServices.Unsafe">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading.Tasks.Extensions">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="Google.Protobuf">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core.Api">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.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>
diff --git a/MessagePack.csproj b/MessagePack.csproj
index 5077d4b10..8ef1751cc 100644
--- a/MessagePack.csproj
+++ b/MessagePack.csproj
@@ -149,10 +149,10 @@
      <Compile Include="Assets\Scripts\NIH\MessagePack\MessagePackSerializationException.cs" />
      <None Include="Assets\Scripts\NIH\MessagePack\MessagePack.asmdef" />
  <Reference Include="UnityEditor.UI">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
+ <HintPath>E:/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>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
@@ -352,50 +352,50 @@
  <Reference Include="UnityEditor.WindowsStandalone.Extensions">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
  </Reference>
- <Reference Include="Microsoft.Extensions.Logging.Abstractions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.SqlServer.Types">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
- </Reference>
- <Reference Include="Newtonsoft.Json">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="QuickGraph">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
- </Reference>
- <Reference Include="Remotion.Linq">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Buffers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
- </Reference>
- <Reference Include="System.Memory">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
- </Reference>
- <Reference Include="System.Runtime.CompilerServices.Unsafe">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
- </Reference>
- <Reference Include="System.Threading.Tasks.Extensions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
- </Reference>
- <Reference Include="Google.Protobuf">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
- </Reference>
- <Reference Include="Grpc.Core">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
- </Reference>
- <Reference Include="Grpc.Core.Api">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll</HintPath>
+ <Reference Include="Substance.Game">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.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>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
  </Reference>
  <Reference Include="SourceUnityLib">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Extensions.Logging.Abstractions">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.SqlServer.Types">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
+ </Reference>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="QuickGraph">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
+ </Reference>
+ <Reference Include="Remotion.Linq">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Buffers">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Memory">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.CompilerServices.Unsafe">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading.Tasks.Extensions">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="Google.Protobuf">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core.Api">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.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>
diff --git a/Substance.EditorHelper.csproj b/Substance.EditorHelper.csproj
index 3ce31600f..1a9a76001 100644
--- a/Substance.EditorHelper.csproj
+++ b/Substance.EditorHelper.csproj
@@ -53,10 +53,10 @@
      <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>
+ <HintPath>E:/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>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
@@ -256,50 +256,50 @@
  <Reference Include="UnityEditor.WindowsStandalone.Extensions">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
  </Reference>
- <Reference Include="Microsoft.Extensions.Logging.Abstractions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.SqlServer.Types">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
- </Reference>
- <Reference Include="Newtonsoft.Json">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="QuickGraph">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
- </Reference>
- <Reference Include="Remotion.Linq">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Buffers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
- </Reference>
- <Reference Include="System.Memory">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
- </Reference>
- <Reference Include="System.Runtime.CompilerServices.Unsafe">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
- </Reference>
- <Reference Include="System.Threading.Tasks.Extensions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
- </Reference>
- <Reference Include="Google.Protobuf">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
- </Reference>
- <Reference Include="Grpc.Core">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
- </Reference>
- <Reference Include="Grpc.Core.Api">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll</HintPath>
+ <Reference Include="Substance.Game">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.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>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
  </Reference>
  <Reference Include="SourceUnityLib">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Extensions.Logging.Abstractions">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.SqlServer.Types">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
+ </Reference>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="QuickGraph">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
+ </Reference>
+ <Reference Include="Remotion.Linq">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Buffers">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Memory">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.CompilerServices.Unsafe">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading.Tasks.Extensions">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="Google.Protobuf">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core.Api">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.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>
diff --git a/Substance.Platform.csproj b/Substance.Platform.csproj
index 8f60d590b..2977cbd79 100644
--- a/Substance.Platform.csproj
+++ b/Substance.Platform.csproj
@@ -53,10 +53,10 @@
      <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>
+ <HintPath>E:/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>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
@@ -256,50 +256,50 @@
  <Reference Include="UnityEditor.WindowsStandalone.Extensions">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
  </Reference>
- <Reference Include="Microsoft.Extensions.Logging.Abstractions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.SqlServer.Types">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
- </Reference>
- <Reference Include="Newtonsoft.Json">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="QuickGraph">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
- </Reference>
- <Reference Include="Remotion.Linq">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Buffers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
- </Reference>
- <Reference Include="System.Memory">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
- </Reference>
- <Reference Include="System.Runtime.CompilerServices.Unsafe">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
- </Reference>
- <Reference Include="System.Threading.Tasks.Extensions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
- </Reference>
- <Reference Include="Google.Protobuf">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
- </Reference>
- <Reference Include="Grpc.Core">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
- </Reference>
- <Reference Include="Grpc.Core.Api">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll</HintPath>
+ <Reference Include="Substance.Game">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.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>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
  </Reference>
  <Reference Include="SourceUnityLib">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Extensions.Logging.Abstractions">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.SqlServer.Types">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
+ </Reference>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="QuickGraph">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
+ </Reference>
+ <Reference Include="Remotion.Linq">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Buffers">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Memory">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.CompilerServices.Unsafe">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading.Tasks.Extensions">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="Google.Protobuf">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core.Api">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.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>
diff --git a/UniRx.csproj b/UniRx.csproj
index 6a708d90d..2ec86debd 100644
--- a/UniRx.csproj
+++ b/UniRx.csproj
@@ -292,10 +292,10 @@
      <None Include="Assets\Scripts\NIH\UniRx\UniRx.asmdef" />
      <None Include="Assets\Scripts\NIH\UniRx\ReadMe.txt" />
  <Reference Include="UnityEditor.UI">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
+ <HintPath>E:/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>
+ <HintPath>E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
  </Reference>
  <Reference Include="UnityEngine">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
@@ -495,50 +495,50 @@
  <Reference Include="UnityEditor.WindowsStandalone.Extensions">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.1.6f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
  </Reference>
- <Reference Include="Microsoft.Extensions.Logging.Abstractions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.SqlServer.Types">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
- </Reference>
- <Reference Include="Newtonsoft.Json">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="QuickGraph">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
- </Reference>
- <Reference Include="Remotion.Linq">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Buffers">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
- </Reference>
- <Reference Include="System.Memory">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
- </Reference>
- <Reference Include="System.Runtime.CompilerServices.Unsafe">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
- </Reference>
- <Reference Include="System.Threading.Tasks.Extensions">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
- </Reference>
- <Reference Include="Google.Protobuf">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
- </Reference>
- <Reference Include="Grpc.Core">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
- </Reference>
- <Reference Include="Grpc.Core.Api">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll</HintPath>
+ <Reference Include="Substance.Game">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance.Game.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>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
  </Reference>
  <Reference Include="SourceUnityLib">
- <HintPath>D:/WIP4/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Extensions.Logging.Abstractions">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.SqlServer.Types">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Microsoft.SqlServer.Types.dll</HintPath>
+ </Reference>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="QuickGraph">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
+ </Reference>
+ <Reference Include="Remotion.Linq">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Buffers">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Buffers.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Memory">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.CompilerServices.Unsafe">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading.Tasks.Extensions">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="Google.Protobuf">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core/lib/net45/Grpc.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Grpc.Core.Api">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Grpc.Core.Api/lib/net45/Grpc.Core.Api.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>