diff --git a/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml b/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml
index 12fa3f8cf..6c4643e50 100644
--- a/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml
+++ b/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml
@@ -1285,6 +1285,7 @@
               <e p="VelocityConversion.cs" t="Include" />
               <e p="VelocityLimit.cs" t="Include" />
               <e p="Visibility.cs" t="Include" />
+              <e p="WanderController.cs" t="Include" />
               <e p="Weapon.cs" t="Include" />
             </e>
             <e p="BlueprintData.cs" t="Include" />
diff --git a/.idea/.idea.Aetheria-Economy/.idea/indexLayout.xml b/.idea/.idea.Aetheria-Economy/.idea/indexLayout.xml
index 454370e0d..5df10e722 100644
--- a/.idea/.idea.Aetheria-Economy/.idea/indexLayout.xml
+++ b/.idea/.idea.Aetheria-Economy/.idea/indexLayout.xml
@@ -13,6 +13,7 @@
       <Path>.git</Path>
       <Path>.idea</Path>
       <Path>Asset Sources</Path>
+      <Path>Build</Path>
       <Path>Economy.Server</Path>
       <Path>Economy.Shared</Path>
       <Path>GameData</Path>
diff --git a/Assets/Prefabs/Properties Panel.prefab b/Assets/Prefabs/Properties Panel.prefab
index 372667897..c8b16e0bd 100644
--- a/Assets/Prefabs/Properties Panel.prefab	
+++ b/Assets/Prefabs/Properties Panel.prefab	
@@ -668,7 +668,7 @@ MonoBehaviour:
       m_Calls: []
   m_text: Kreacher's Comfort
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: f353c922a07f02041bdb1694a3faf9b7, type: 2}
   m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417,
     type: 2}
   m_fontSharedMaterials: []
diff --git a/Assets/Prefabs/Tab Button Primary.prefab b/Assets/Prefabs/Tab Button Primary.prefab
index 1588911cb..af91e7240 100644
--- a/Assets/Prefabs/Tab Button Primary.prefab	
+++ b/Assets/Prefabs/Tab Button Primary.prefab	
@@ -163,7 +163,7 @@ MonoBehaviour:
       m_Calls: []
   m_text: Corporation
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 9dcd07b95faae7641a3ff6fccab43c32, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 54f472d4b2cd9b84b8d9917ec13a4e94, type: 2}
   m_sharedMaterial: {fileID: 21906973755630180, guid: 9dcd07b95faae7641a3ff6fccab43c32,
     type: 2}
   m_fontSharedMaterials: []
@@ -190,7 +190,7 @@ MonoBehaviour:
   m_outlineColor:
     serializedVersion: 2
     rgba: 4278190080
-  m_fontSize: 32
+  m_fontSize: 28
   m_fontSizeBase: 32
   m_fontWeight: 400
   m_enableAutoSizing: 0
@@ -384,6 +384,10 @@ MonoBehaviour:
     FillColor: {r: 0, g: 0.4180913, b: 1, a: 0.7490196}
     OutlineColor: {r: 1, g: 1, b: 1, a: 1}
     LayoutPadding: 32
+  DisabledAppearance:
+    FillColor: {r: 0, g: 0, b: 0, a: 0}
+    OutlineColor: {r: 0, g: 0, b: 0, a: 0}
+    LayoutPadding: 0
   Tab: {fileID: 0}
 --- !u!1 &6976631978676041201
 GameObject:
diff --git a/Assets/Resources/Retro.meta b/Assets/Resources/Retro.meta
new file mode 100644
index 000000000..6c19e5791
--- /dev/null
+++ b/Assets/Resources/Retro.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ac7eb8ee07f93dc4f94c8d60031bc7c7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Resources/Retro/LRT Oksana Bold SDF.asset b/Assets/Resources/Retro/LRT Oksana Bold SDF.asset
new file mode 100644
index 000000000..af074145d
--- /dev/null
+++ b/Assets/Resources/Retro/LRT Oksana Bold SDF.asset	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:006e56ba2565d361bd7edaa3fa51bdca4f360987e26dfa181bf1033f45eb22b9
+size 2298500
diff --git a/Assets/Resources/Retro/LRT Oksana Bold SDF.asset.meta b/Assets/Resources/Retro/LRT Oksana Bold SDF.asset.meta
new file mode 100644
index 000000000..947a1b7cd
--- /dev/null
+++ b/Assets/Resources/Retro/LRT Oksana Bold SDF.asset.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 54f472d4b2cd9b84b8d9917ec13a4e94
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Resources/Retro/LRT Oksana Bold.ttf b/Assets/Resources/Retro/LRT Oksana Bold.ttf
new file mode 100644
index 000000000..43acc648a
--- /dev/null
+++ b/Assets/Resources/Retro/LRT Oksana Bold.ttf	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5dd136f5eb53d46fb5266171b8d42c87bedf351913e1737bd2a4fd54de60cba0
+size 80520
diff --git a/Assets/Resources/Retro/LRT Oksana Bold.ttf.meta b/Assets/Resources/Retro/LRT Oksana Bold.ttf.meta
new file mode 100644
index 000000000..2c48c4446
--- /dev/null
+++ b/Assets/Resources/Retro/LRT Oksana Bold.ttf.meta	
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 6cebae1541281bf428f1ec94b1ca8d9f
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: LT Oksana
+  fontNames:
+  - LT Oksana
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Resources/Retro/LRT Oksana SDF.asset b/Assets/Resources/Retro/LRT Oksana SDF.asset
new file mode 100644
index 000000000..7ec1f0e58
--- /dev/null
+++ b/Assets/Resources/Retro/LRT Oksana SDF.asset	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:880f029d80fcf9a8957fbddfc7feb639192b364e72b45f0c61236b9397f01558
+size 2298753
diff --git a/Assets/Resources/Retro/LRT Oksana SDF.asset.meta b/Assets/Resources/Retro/LRT Oksana SDF.asset.meta
new file mode 100644
index 000000000..12fee08bc
--- /dev/null
+++ b/Assets/Resources/Retro/LRT Oksana SDF.asset.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f353c922a07f02041bdb1694a3faf9b7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Resources/Retro/LRT Oksana.ttf b/Assets/Resources/Retro/LRT Oksana.ttf
new file mode 100644
index 000000000..83ea112e2
--- /dev/null
+++ b/Assets/Resources/Retro/LRT Oksana.ttf	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:233da780b79364148aa14025f9cb1da0b13b78d698cab9e09c664ae3e0d0d82f
+size 88148
diff --git a/Assets/Resources/Retro/LRT Oksana.ttf.meta b/Assets/Resources/Retro/LRT Oksana.ttf.meta
new file mode 100644
index 000000000..53dec1969
--- /dev/null
+++ b/Assets/Resources/Retro/LRT Oksana.ttf.meta	
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 5499d8cfb994f894eb843bac1b19bc3f
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: LT Oksana
+  fontNames:
+  - LT Oksana
+  fallbackFontReferences:
+  - {fileID: 12800000, guid: 6cebae1541281bf428f1ec94b1ca8d9f, type: 3}
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
index ae057ed12..8ef76db87 100644
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
@@ -275,6 +275,12 @@ PrefabInstance:
       propertyPath: m_textInfo.pageCount
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4750078953547169287, guid: b93e36d73a071274d8e9225e077ce92a,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 21096540314249858, guid: 54f472d4b2cd9b84b8d9917ec13a4e94,
+        type: 2}
     - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -388,7 +394,7 @@ PrefabInstance:
     - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 86.84
+      value: 84.44
       objectReference: {fileID: 0}
     - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
@@ -528,7 +534,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 26245407}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3}
   m_Name: 
@@ -600,7 +606,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 43948816}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3}
   m_Name: 
@@ -1262,12 +1268,12 @@ PrefabInstance:
     - target: {fileID: 2378632238049155248, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: -707.7081
+      value: -676.704
       objectReference: {fileID: 0}
     - target: {fileID: 2378632238049155248, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.00012207031
+      value: 0.000030517578
       objectReference: {fileID: 0}
     - target: {fileID: 2378632238049155251, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -1378,7 +1384,7 @@ PrefabInstance:
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -458.20905
+      value: -457.77698
       objectReference: {fileID: 0}
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -1388,7 +1394,7 @@ PrefabInstance:
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 852.4181
+      value: 851.55396
       objectReference: {fileID: 0}
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -1408,7 +1414,7 @@ PrefabInstance:
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -1448,7 +1454,7 @@ PrefabInstance:
     - target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -72.354996
+      value: -87.42499
       objectReference: {fileID: 0}
     - target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -1458,7 +1464,7 @@ PrefabInstance:
     - target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 80.71
+      value: 110.84997
       objectReference: {fileID: 0}
     - target: {fileID: 5116519198747529738, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -1659,7 +1665,7 @@ MonoBehaviour:
       m_Calls: []
   m_text: Corporation Name
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: f353c922a07f02041bdb1694a3faf9b7, type: 2}
   m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417,
     type: 2}
   m_fontSharedMaterials: []
@@ -1738,7 +1744,7 @@ MonoBehaviour:
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_spriteAnimator: {fileID: 0}
-  m_hasFontAssetChanged: 0
+  m_hasFontAssetChanged: 1
   m_subTextObjects:
   - {fileID: 0}
   - {fileID: 0}
@@ -3702,12 +3708,12 @@ PrefabInstance:
     - target: {fileID: 2378632238049155248, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: -707.7081
+      value: -676.704
       objectReference: {fileID: 0}
     - target: {fileID: 2378632238049155248, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.00012207031
+      value: 0.000030517578
       objectReference: {fileID: 0}
     - target: {fileID: 2378632238049155251, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -3818,7 +3824,7 @@ PrefabInstance:
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -458.20905
+      value: -457.77698
       objectReference: {fileID: 0}
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -3828,7 +3834,7 @@ PrefabInstance:
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 852.4181
+      value: 851.55396
       objectReference: {fileID: 0}
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -3848,7 +3854,7 @@ PrefabInstance:
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -3893,7 +3899,7 @@ PrefabInstance:
     - target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -72.354996
+      value: -87.42499
       objectReference: {fileID: 0}
     - target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -3903,7 +3909,7 @@ PrefabInstance:
     - target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 80.71
+      value: 110.84997
       objectReference: {fileID: 0}
     - target: {fileID: 5116519198747529738, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -4245,7 +4251,7 @@ MonoBehaviour:
       m_Calls: []
   m_text: Select Parent Corporation
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: f353c922a07f02041bdb1694a3faf9b7, type: 2}
   m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417,
     type: 2}
   m_fontSharedMaterials: []
@@ -4324,7 +4330,7 @@ MonoBehaviour:
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_spriteAnimator: {fileID: 0}
-  m_hasFontAssetChanged: 0
+  m_hasFontAssetChanged: 1
   m_subTextObjects:
   - {fileID: 0}
   - {fileID: 0}
@@ -5887,6 +5893,12 @@ PrefabInstance:
       propertyPath: m_subTextObjects.Array.data[1]
       value: 
       objectReference: {fileID: 105783976}
+    - target: {fileID: 4750078953547169287, guid: b93e36d73a071274d8e9225e077ce92a,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 21096540314249858, guid: 54f472d4b2cd9b84b8d9917ec13a4e94,
+        type: 2}
     - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -6000,7 +6012,7 @@ PrefabInstance:
     - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 81.615005
+      value: 79.685
       objectReference: {fileID: 0}
     - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
@@ -6640,7 +6652,7 @@ MonoBehaviour:
       m_Calls: []
   m_text: 'Name Your Corporation:'
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: f353c922a07f02041bdb1694a3faf9b7, type: 2}
   m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417,
     type: 2}
   m_fontSharedMaterials: []
@@ -6719,7 +6731,7 @@ MonoBehaviour:
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_spriteAnimator: {fileID: 0}
-  m_hasFontAssetChanged: 0
+  m_hasFontAssetChanged: 1
   m_subTextObjects:
   - {fileID: 0}
   - {fileID: 0}
@@ -6821,6 +6833,12 @@ PrefabInstance:
       propertyPath: m_textInfo.pageCount
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4750078953547169287, guid: b93e36d73a071274d8e9225e077ce92a,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 21096540314249858, guid: 54f472d4b2cd9b84b8d9917ec13a4e94,
+        type: 2}
     - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -6934,7 +6952,7 @@ PrefabInstance:
     - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 82.94
+      value: 88.619995
       objectReference: {fileID: 0}
     - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
@@ -8156,8 +8174,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Haverford
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2}
-  m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417,
+  m_fontAsset: {fileID: 11400000, guid: f353c922a07f02041bdb1694a3faf9b7, type: 2}
+  m_sharedMaterial: {fileID: 21423695648544140, guid: f353c922a07f02041bdb1694a3faf9b7,
     type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
@@ -8183,7 +8201,7 @@ MonoBehaviour:
   m_outlineColor:
     serializedVersion: 2
     rgba: 4278190080
-  m_fontSize: 72
+  m_fontSize: 64.95
   m_fontSizeBase: 72
   m_fontWeight: 400
   m_enableAutoSizing: 1
@@ -9099,12 +9117,12 @@ PrefabInstance:
     - target: {fileID: 2378632238049155248, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: -707.7081
+      value: -676.704
       objectReference: {fileID: 0}
     - target: {fileID: 2378632238049155248, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.00012207031
+      value: 0.000030517578
       objectReference: {fileID: 0}
     - target: {fileID: 2378632238049155251, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -9215,7 +9233,7 @@ PrefabInstance:
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -458.20905
+      value: -457.77698
       objectReference: {fileID: 0}
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -9225,7 +9243,7 @@ PrefabInstance:
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 852.4181
+      value: 851.55396
       objectReference: {fileID: 0}
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -9245,7 +9263,7 @@ PrefabInstance:
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2378632240158519326, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -9290,7 +9308,7 @@ PrefabInstance:
     - target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -72.354996
+      value: -87.42499
       objectReference: {fileID: 0}
     - target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -9300,7 +9318,7 @@ PrefabInstance:
     - target: {fileID: 5116519198747529736, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 80.71
+      value: 110.84997
       objectReference: {fileID: 0}
     - target: {fileID: 5116519198747529738, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
         type: 3}
@@ -13095,6 +13113,12 @@ PrefabInstance:
       propertyPath: m_textInfo.pageCount
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4750078953547169287, guid: b93e36d73a071274d8e9225e077ce92a,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 21096540314249858, guid: 54f472d4b2cd9b84b8d9917ec13a4e94,
+        type: 2}
     - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -13208,7 +13232,7 @@ PrefabInstance:
     - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 120.51
+      value: 119.65
       objectReference: {fileID: 0}
     - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
@@ -20070,6 +20094,12 @@ PrefabInstance:
       propertyPath: m_subTextObjects.Array.data[1]
       value: 
       objectReference: {fileID: 426675036}
+    - target: {fileID: 4750078953547169287, guid: b93e36d73a071274d8e9225e077ce92a,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 21096540314249858, guid: 54f472d4b2cd9b84b8d9917ec13a4e94,
+        type: 2}
     - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -20183,7 +20213,7 @@ PrefabInstance:
     - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 84.72
+      value: 89.78
       objectReference: {fileID: 0}
     - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
@@ -20323,7 +20353,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1913509429}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3}
   m_Name: 
@@ -22288,6 +22318,12 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5116519198747529738, guid: 4fca44e21a27a6d48916d2cc4b6e2df0,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 21423695648544140, guid: f353c922a07f02041bdb1694a3faf9b7,
+        type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4fca44e21a27a6d48916d2cc4b6e2df0, type: 3}
 --- !u!114 &7350752487568396160 stripped
@@ -22361,6 +22397,27 @@ PrefabInstance:
       propertyPath: m_subTextObjects.Array.data[1]
       value: 
       objectReference: {fileID: 650897775}
+    - target: {fileID: 4750078953547169287, guid: b93e36d73a071274d8e9225e077ce92a,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 21096540314249858, guid: 54f472d4b2cd9b84b8d9917ec13a4e94,
+        type: 2}
+    - target: {fileID: 4750078953547169287, guid: b93e36d73a071274d8e9225e077ce92a,
+        type: 3}
+      propertyPath: m_firstOverflowCharacterIndex
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4750078953547169287, guid: b93e36d73a071274d8e9225e077ce92a,
+        type: 3}
+      propertyPath: m_textAlignment
+      value: 514
+      objectReference: {fileID: 0}
+    - target: {fileID: 4750078953547169287, guid: b93e36d73a071274d8e9225e077ce92a,
+        type: 3}
+      propertyPath: m_fontSizeBase
+      value: 28
+      objectReference: {fileID: 0}
     - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -22474,7 +22531,7 @@ PrefabInstance:
     - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 125.285
+      value: 126.31
       objectReference: {fileID: 0}
     - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a,
         type: 3}
diff --git a/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs b/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs
index 8e4e54401..4ab66df32 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs
@@ -93,6 +93,7 @@ public abstract class PersistentBehaviorData
  Union(26, typeof(MiningToolData)),
  Union(27, typeof(SurveyControllerData)),
  Union(28, typeof(ResourceScannerData)),
+ Union(29, typeof(WanderControllerData)),
  JsonConverter(typeof(JsonKnownTypesConverter<BehaviorData>)), JsonObject(MemberSerialization.OptIn)]
 public abstract class BehaviorData
 {
diff --git a/Assets/Scripts/ServerShared/Behaviors/WanderController.cs b/Assets/Scripts/ServerShared/Behaviors/WanderController.cs
new file mode 100644
index 000000000..ac6d8cf46
--- /dev/null
+++ b/Assets/Scripts/ServerShared/Behaviors/WanderController.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using MessagePack;
+using Newtonsoft.Json;
+using RethinkDb.Driver.Ast;
+using Unity.Mathematics;
+using static Unity.Mathematics.math;
+
+[MessagePackObject, JsonObject(MemberSerialization.OptIn), EntityTypeRestriction(HullType.Ship), Order(-100)]
+public class WanderControllerData : ControllerData
+{
+    [InspectableField, JsonProperty("randomDockTime"), Key(6)]  
+    public float RandomDockTime = 5;
+    
+    public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item)
+    {
+        return new WanderController(context, this, entity, item);
+    }
+}
+
+public class WanderController : ControllerBase, IBehavior
+{
+    public WanderTarget WanderTarget;
+    public override TaskType TaskType => TaskType.None;
+    public BehaviorData Data => _data;
+    
+    private WanderControllerData _data;
+    private GameContext _context;
+    private Entity _entity;
+    private Gear _item;
+    private Guid _target;
+    private float _dockTime = -1;
+    
+    public WanderController(GameContext context, WanderControllerData data, Entity entity, Gear item) : base(context, data, entity)
+    {
+        _context = context;
+        _data = data;
+        _entity = entity;
+        _item = item;
+    }
+
+    public new bool Update(float delta)
+    {
+        if (!Moving && _dockTime < 0)
+        {
+            NextTarget();
+        }
+
+        _dockTime -= delta;
+        return base.Update(delta);
+    }
+
+    private void NextTarget()
+    {
+        if (WanderTarget == WanderTarget.Planets)
+        {
+            var planets = _context.ZonePlanets[_entity.Zone];
+            var randomPlanet = _context.Cache.Get<PlanetData>(planets[_context.Random.NextInt(planets.Length)]);
+            MoveTo(() => _context.GetOrbitPosition(randomPlanet.Orbit), () => _context.GetOrbitVelocity(randomPlanet.Orbit));
+        }
+        else if (WanderTarget == WanderTarget.Orbitals)
+        {
+            var entities = _context.ZoneEntities[_entity.Zone].Values.ToArray();
+            var randomEntity = entities[_context.Random.NextInt(entities.Length)];
+            MoveTo(randomEntity, true, () =>
+            {
+                _context.SetParent(_entity, randomEntity);
+                _dockTime = _context.Random.NextFloat(_data.RandomDockTime);
+            });
+        }
+    }
+}
+
+public enum WanderTarget
+{
+    Planets,
+    Orbitals
+}
\ No newline at end of file
diff --git a/Assets/Scripts/ServerShared/Behaviors/WanderController.cs.meta b/Assets/Scripts/ServerShared/Behaviors/WanderController.cs.meta
new file mode 100644
index 000000000..fd8efa78d
--- /dev/null
+++ b/Assets/Scripts/ServerShared/Behaviors/WanderController.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 38e6f1535d5cf5642bd01b1ab7a34492
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/StrategyGameManager.cs b/Assets/Scripts/StrategyGameManager.cs
index aef3ce82f..78f77d91c 100644
--- a/Assets/Scripts/StrategyGameManager.cs
+++ b/Assets/Scripts/StrategyGameManager.cs
@@ -985,6 +985,83 @@ public class StrategyGameManager : MonoBehaviour
         }
     }
 
+    void loadtest(string[] args)
+    {
+        if (!TestMode)
+            return;
+
+        if (args.Length < 4)
+        {
+            Debug.Log("Expected arguments: Wanderer count, Patroller count, Orbital count!");
+            return;
+        }
+        
+        var zoneData = _cache.Get<ZoneData>(_populatedZone);
+
+        if (zoneData == null)
+        {
+            Debug.Log("Attempted to spawn ship but no zone is populated!");
+            return;
+        }
+
+        int wanderers;
+        if(!int.TryParse(args[1], out wanderers))
+        {
+            Debug.Log("Argument 1: Wanderer count invalid");
+            return;
+        }
+        for (int i = 0; i < wanderers; i++)
+        {
+            var loadoutData = _context.Cache.GetAll<LoadoutData>().FirstOrDefault(l => l.Name == "Wanderer");
+            if (loadoutData == null)
+            {
+                Debug.Log($"Loadout with name \"{args[1]}\" not found!");
+                return;
+            }
+
+            var entity = _context.CreateEntity(_populatedZone, _playerCorporation, loadoutData.ID);
+            entity.GetBehaviors<WanderController>().First().WanderTarget = _context.Random.NextFloat() > .5f
+                ? WanderTarget.Planets
+                : WanderTarget.Orbitals;
+        }
+        
+        int patrollers;
+        if(!int.TryParse(args[2], out patrollers))
+        {
+            Debug.Log("Argument 2: Patroller count invalid");
+            return;
+        }
+        for (int i = 0; i < patrollers; i++)
+        {
+            var loadoutData = _context.Cache.GetAll<LoadoutData>().FirstOrDefault(l => l.Name == "Patroller");
+            if (loadoutData == null)
+            {
+                Debug.Log($"Loadout with name \"{args[1]}\" not found!");
+                return;
+            }
+
+            _context.CreateEntity(_populatedZone, _playerCorporation, loadoutData.ID);
+        }
+        
+        int colonies;
+        if(!int.TryParse(args[1], out colonies))
+        {
+            Debug.Log("Argument 3: Colony count invalid");
+            return;
+        }
+        for (int i = 0; i < colonies; i++)
+        {
+            var loadoutData = _context.Cache.GetAll<LoadoutData>().FirstOrDefault(l => l.Name == "Orbital Colony");
+            if (loadoutData == null)
+            {
+                Debug.Log($"Loadout with name \"{args[1]}\" not found!");
+                return;
+            }
+
+            _context.CreateEntity(_populatedZone, _playerCorporation, loadoutData.ID);
+        }
+    }
+
     void spawn(string[] args)
     {
         if (!TestMode)
diff --git a/Economy.Shared.Unity.csproj b/Economy.Shared.Unity.csproj
index e97fc1135..4e1c16b33 100644
--- a/Economy.Shared.Unity.csproj
+++ b/Economy.Shared.Unity.csproj
@@ -102,6 +102,7 @@
     <Compile Include="Assets\Scripts\ServerShared\Behaviors\VelocityConversion.cs" />
     <Compile Include="Assets\Scripts\ServerShared\Behaviors\VelocityLimit.cs" />
     <Compile Include="Assets\Scripts\ServerShared\Behaviors\Visibility.cs" />
+    <Compile Include="Assets\Scripts\ServerShared\Behaviors\WanderController.cs" />
     <Compile Include="Assets\Scripts\ServerShared\Behaviors\Weapon.cs" />
     <Compile Include="Assets\Scripts\ServerShared\BlueprintData.cs" />
     <Compile Include="Assets\Scripts\ServerShared\Corporations.cs" />