diff --git a/.gitignore b/.gitignore
index 50c0415..8d76898 100644
--- a/.gitignore
+++ b/.gitignore
@@ -250,4 +250,5 @@ ModelManifest.xml
 .paket/paket.exe
 
 # FAKE - F# Make
-.fake/
\ No newline at end of file
+.fake/
+GameBinaries
diff --git a/Torch.API/Torch.API.csproj b/Torch.API/Torch.API.csproj
index 4c93e33..d66de92 100644
--- a/Torch.API/Torch.API.csproj
+++ b/Torch.API/Torch.API.csproj
@@ -32,29 +32,43 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HavokWrapper, Version=1.0.6278.22649, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\HavokWrapper.dll</HintPath>
+    </Reference>
     <Reference Include="NLog">
       <HintPath>..\packages\NLog.4.4.1\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Sandbox.Common">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\Sandbox.Common.dll</HintPath>
+    <Reference Include="Sandbox.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\Sandbox.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Sandbox.Game">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\Sandbox.Game.dll</HintPath>
+    <Reference Include="Sandbox.Game, Version=0.1.6305.30774, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\Sandbox.Game.dll</HintPath>
     </Reference>
-    <Reference Include="Sandbox.Graphics">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\Sandbox.Graphics.dll</HintPath>
+    <Reference Include="Sandbox.Graphics, Version=0.1.6305.30761, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\Sandbox.Graphics.dll</HintPath>
     </Reference>
-    <Reference Include="SpaceEngineers.Game">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\SpaceEngineers.Game.dll</HintPath>
+    <Reference Include="SpaceEngineers.Game, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\SpaceEngineers.Game.dll</HintPath>
     </Reference>
-    <Reference Include="SpaceEngineers.ObjectBuilders">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\SpaceEngineers.ObjectBuilders.dll</HintPath>
+    <Reference Include="SpaceEngineers.ObjectBuilders, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\SpaceEngineers.ObjectBuilders.dll</HintPath>
     </Reference>
-    <Reference Include="SpaceEngineers.ObjectBuilders.XmlSerializers">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\SpaceEngineers.ObjectBuilders.XmlSerializers.dll</HintPath>
+    <Reference Include="SpaceEngineers.ObjectBuilders.XmlSerializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\SpaceEngineers.ObjectBuilders.XmlSerializers.dll</HintPath>
+    </Reference>
+    <Reference Include="SteamSDK, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\SteamSDK.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -69,44 +83,57 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
+    <Reference Include="Torch">
+      <HintPath>..\Torch.Server\bin\x64\Release\Torch.dll</HintPath>
+    </Reference>
     <Reference Include="VRage">
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\GameBinaries\VRage.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Audio">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Audio.dll</HintPath>
-    </Reference>
-    <Reference Include="VRage.Game">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Game.dll</HintPath>
-    </Reference>
-    <Reference Include="VRage.Game.XmlSerializers">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Game.XmlSerializers.dll</HintPath>
-    </Reference>
-    <Reference Include="VRage.Input">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Input.dll</HintPath>
-    </Reference>
-    <Reference Include="VRage.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="VRage.Audio, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Library.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\GameBinaries\VRage.Audio.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Math">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Math.dll</HintPath>
+    <Reference Include="VRage.Dedicated">
+      <HintPath>..\GameBinaries\VRage.Dedicated.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Native">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Native.dll</HintPath>
+    <Reference Include="VRage.Game, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\VRage.Game.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.OpenVRWrapper">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.OpenVRWrapper.dll</HintPath>
+    <Reference Include="VRage.Game.XmlSerializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\VRage.Game.XmlSerializers.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Render">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Render.dll</HintPath>
+    <Reference Include="VRage.Input, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\VRage.Input.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Render11">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Render11.dll</HintPath>
+    <Reference Include="VRage.Library">
+      <HintPath>..\GameBinaries\VRage.Library.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Scripting">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Scripting.dll</HintPath>
+    <Reference Include="VRage.Math, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\VRage.Math.dll</HintPath>
+    </Reference>
+    <Reference Include="VRage.Native, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\VRage.Native.dll</HintPath>
+    </Reference>
+    <Reference Include="VRage.OpenVRWrapper, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\VRage.OpenVRWrapper.dll</HintPath>
+    </Reference>
+    <Reference Include="VRage.Render, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\VRage.Render.dll</HintPath>
+    </Reference>
+    <Reference Include="VRage.Render11, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\VRage.Render11.dll</HintPath>
+    </Reference>
+    <Reference Include="VRage.Scripting, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\VRage.Scripting.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Torch.Client/Properties/AssemblyInfo.cs b/Torch.Client/Properties/AssemblyInfo.cs
index ea6cf1e..7aa4672 100644
--- a/Torch.Client/Properties/AssemblyInfo.cs
+++ b/Torch.Client/Properties/AssemblyInfo.cs
@@ -1,16 +1,4 @@
-
-using System.Reflection;
-using System.Runtime.InteropServices;
+using System.Reflection;
 
-[assembly: AssemblyTitle("Torch Client")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Torch")]
-[assembly: AssemblyCopyright("Copyright © Torch API 2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-[assembly: AssemblyVersion("1.0.89.540")]
-[assembly: AssemblyFileVersion("1.0.89.540")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.0.105.498")]
+[assembly: AssemblyFileVersion("1.0.105.498")]
\ No newline at end of file
diff --git a/Torch.Client/Properties/AssemblyInfo.tt b/Torch.Client/Properties/AssemblyInfo.tt
index c1b48cf..9937cb7 100644
--- a/Torch.Client/Properties/AssemblyInfo.tt
+++ b/Torch.Client/Properties/AssemblyInfo.tt
@@ -4,19 +4,7 @@
 <#@ import namespace="System.Text" #>
 <#@ import namespace="System.Collections.Generic" #>
 <#@ output extension=".cs" #>
-
 using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Torch Client")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Torch")]
-[assembly: AssemblyCopyright("Copyright © Torch API 2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
 
 <#  var dt = DateTime.Now;
     int major = 1;
diff --git a/Torch.Client/Properties/AssemblyInfo1.cs b/Torch.Client/Properties/AssemblyInfo1.cs
new file mode 100644
index 0000000..013f62e
--- /dev/null
+++ b/Torch.Client/Properties/AssemblyInfo1.cs
@@ -0,0 +1,12 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Torch Client")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Torch")]
+[assembly: AssemblyCopyright("Copyright © Torch API 2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Torch.Client/Torch.Client.csproj b/Torch.Client/Torch.Client.csproj
index cafcd96..6dacd83 100644
--- a/Torch.Client/Torch.Client.csproj
+++ b/Torch.Client/Torch.Client.csproj
@@ -108,6 +108,7 @@
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
     </Compile>
+    <Compile Include="Properties\AssemblyInfo1.cs" />
     <Compile Include="TorchClient.cs" />
     <Compile Include="TorchConsoleScreen.cs" />
     <Compile Include="TorchMainMenuScreen.cs" />
diff --git a/Torch.Server/Properties/AssemblyInfo.cs b/Torch.Server/Properties/AssemblyInfo.cs
index 68a074f..7aa4672 100644
--- a/Torch.Server/Properties/AssemblyInfo.cs
+++ b/Torch.Server/Properties/AssemblyInfo.cs
@@ -1,16 +1,4 @@
-
-using System.Reflection;
-using System.Runtime.InteropServices;
+using System.Reflection;
 
-[assembly: AssemblyTitle("Torch Server")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Torch")]
-[assembly: AssemblyCopyright("Copyright © Torch API 2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-[assembly: AssemblyVersion("1.0.89.540")]
-[assembly: AssemblyFileVersion("1.0.89.540")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.0.105.498")]
+[assembly: AssemblyFileVersion("1.0.105.498")]
\ No newline at end of file
diff --git a/Torch.Server/Properties/AssemblyInfo.tt b/Torch.Server/Properties/AssemblyInfo.tt
index eee6580..9937cb7 100644
--- a/Torch.Server/Properties/AssemblyInfo.tt
+++ b/Torch.Server/Properties/AssemblyInfo.tt
@@ -4,19 +4,7 @@
 <#@ import namespace="System.Text" #>
 <#@ import namespace="System.Collections.Generic" #>
 <#@ output extension=".cs" #>
-
 using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Torch Server")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Torch")]
-[assembly: AssemblyCopyright("Copyright © Torch API 2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
 
 <#  var dt = DateTime.Now;
     int major = 1;
diff --git a/Torch.Server/Properties/AssemblyInfo1.cs b/Torch.Server/Properties/AssemblyInfo1.cs
new file mode 100644
index 0000000..c1db141
--- /dev/null
+++ b/Torch.Server/Properties/AssemblyInfo1.cs
@@ -0,0 +1,12 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Torch Server")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Torch")]
+[assembly: AssemblyCopyright("Copyright © Torch API 2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index 4026157..571a865 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -45,46 +45,48 @@
   <ItemGroup>
     <Reference Include="HavokWrapper, Version=1.0.6051.28726, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\DedicatedServer64\HavokWrapper.dll</HintPath>
+      <HintPath>..\GameBinaries\HavokWrapper.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\Microsoft.CodeAnalysis.dll</HintPath>
+      <HintPath>..\GameBinaries\Microsoft.CodeAnalysis.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <HintPath>..\GameBinaries\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.4.1\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Sandbox.Common">
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\Sandbox.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="Sandbox.Game">
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\Sandbox.Game.dll</HintPath>
-    </Reference>
-    <Reference Include="Sandbox.Graphics, Version=0.1.6236.31422, Culture=neutral, processorArchitecture=AMD64">
+    <Reference Include="Sandbox.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\Sandbox.Graphics.dll</HintPath>
+      <HintPath>..\GameBinaries\Sandbox.Common.dll</HintPath>
     </Reference>
-    <Reference Include="SpaceEngineers.Game">
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\SpaceEngineers.Game.dll</HintPath>
+    <Reference Include="Sandbox.Game, Version=0.1.6305.30774, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\Sandbox.Game.dll</HintPath>
+    </Reference>
+    <Reference Include="Sandbox.Graphics, Version=0.1.6305.30761, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\Sandbox.Graphics.dll</HintPath>
+    </Reference>
+    <Reference Include="SpaceEngineers.Game, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\SpaceEngineers.Game.dll</HintPath>
     </Reference>
     <Reference Include="SpaceEngineers.ObjectBuilders, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\SpaceEngineers.ObjectBuilders.dll</HintPath>
+      <HintPath>..\GameBinaries\SpaceEngineers.ObjectBuilders.dll</HintPath>
     </Reference>
     <Reference Include="SpaceEngineers.ObjectBuilders.XmlSerializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\SpaceEngineers.ObjectBuilders.XmlSerializers.dll</HintPath>
+      <HintPath>..\GameBinaries\SpaceEngineers.ObjectBuilders.XmlSerializers.dll</HintPath>
     </Reference>
     <Reference Include="SteamSDK, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\SteamSDK.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\GameBinaries\SteamSDK.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration.Install" />
@@ -101,51 +103,57 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="VRage">
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.dll</HintPath>
+    <Reference Include="VRage, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\VRage.dll</HintPath>
     </Reference>
     <Reference Include="VRage.Audio, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Audio.dll</HintPath>
+      <HintPath>..\GameBinaries\VRage.Audio.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Dedicated">
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Dedicated.dll</HintPath>
+    <Reference Include="VRage.Dedicated, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\VRage.Dedicated.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Game">
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Game.dll</HintPath>
+    <Reference Include="VRage.Game, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\VRage.Game.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Game.XmlSerializers">
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Game.XmlSerializers.dll</HintPath>
+    <Reference Include="VRage.Game.XmlSerializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\VRage.Game.XmlSerializers.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Input">
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Input.dll</HintPath>
+    <Reference Include="VRage.Input, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\VRage.Input.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Library">
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Library.dll</HintPath>
+    <Reference Include="VRage.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\VRage.Library.dll</HintPath>
     </Reference>
     <Reference Include="VRage.Math, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Math.dll</HintPath>
+      <HintPath>..\GameBinaries\VRage.Math.dll</HintPath>
     </Reference>
     <Reference Include="VRage.Native, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Native.dll</HintPath>
+      <HintPath>..\GameBinaries\VRage.Native.dll</HintPath>
     </Reference>
     <Reference Include="VRage.OpenVRWrapper, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.OpenVRWrapper.dll</HintPath>
+      <HintPath>..\GameBinaries\VRage.OpenVRWrapper.dll</HintPath>
     </Reference>
     <Reference Include="VRage.Render, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Render.dll</HintPath>
+      <HintPath>..\GameBinaries\VRage.Render.dll</HintPath>
     </Reference>
     <Reference Include="VRage.Render11, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Render11.dll</HintPath>
+      <HintPath>..\GameBinaries\VRage.Render11.dll</HintPath>
     </Reference>
     <Reference Include="VRage.Scripting, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Scripting.dll</HintPath>
+      <HintPath>..\GameBinaries\VRage.Scripting.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
@@ -158,6 +166,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>AssemblyInfo.tt</DependentUpon>
     </Compile>
+    <Compile Include="Properties\AssemblyInfo1.cs" />
     <Compile Include="TorchConfig.cs" />
     <Compile Include="TorchService.cs">
       <SubType>Component</SubType>
diff --git a/Torch.Server/TorchServer.cs b/Torch.Server/TorchServer.cs
index 711ab5a..32a6748 100644
--- a/Torch.Server/TorchServer.cs
+++ b/Torch.Server/TorchServer.cs
@@ -24,6 +24,7 @@ using VRage.Dedicated;
 using VRage.FileSystem;
 using VRage.Game;
 using VRage.Game.ModAPI;
+using VRage.Game.ObjectBuilder;
 using VRage.Game.SessionComponents;
 using VRage.Profiler;
 
@@ -59,11 +60,11 @@ namespace Torch.Server
             MyPerServerSettings.GameDSName = MyPerServerSettings.GameNameSafe + "Dedicated";
             MyPerServerSettings.GameDSDescription = "Your place for space engineering, destruction and exploring.";
             MySessionComponentExtDebug.ForceDisable = true;
-            MyPerServerSettings.AppId = 244850u;
-            var gameVersion = MyPerGameSettings.BasicGameInfo.GameVersion;
-            MyFinalBuildConstants.APP_VERSION = gameVersion ?? 0;
+            MyPerServerSettings.AppId = 244850;
+            MyFinalBuildConstants.APP_VERSION = MyPerGameSettings.BasicGameInfo.GameVersion;
+            //MyGlobalTypeMetadata.Static.Init();
 
-            //TODO: Allows players to filter servers for Torch in the server browser.
+            //TODO: Allows players to filter servers for Torch in the server browser. Need to init Steam before this
             //SteamServerAPI.Instance.GameServer.SetKeyValue("SM", "Torch");
         }
 
diff --git a/Torch.Server/ViewModels/SteamUserViewModel.cs b/Torch.Server/ViewModels/SteamUserViewModel.cs
new file mode 100644
index 0000000..30c3096
--- /dev/null
+++ b/Torch.Server/ViewModels/SteamUserViewModel.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Torch.Server.ViewModels
+{
+    class SteamUserViewModel
+    {
+    }
+}
diff --git a/Torch.Server/Views/ConfigControl.xaml b/Torch.Server/Views/ConfigControl.xaml
index 68e5b92..0bf2f5e 100644
--- a/Torch.Server/Views/ConfigControl.xaml
+++ b/Torch.Server/Views/ConfigControl.xaml
@@ -1,185 +1,207 @@
 <UserControl x:Class="Torch.Server.Views.ConfigControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:Torch.Server.Views"
              xmlns:viewModels="clr-namespace:Torch.Server.ViewModels"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              Background="White">
     <UserControl.DataContext>
-        <viewModels:ConfigDedicatedViewModel/>
+        <viewModels:ConfigDedicatedViewModel />
     </UserControl.DataContext>
-    <StackPanel>
-        <DockPanel>
-            <Label Content="World:" DockPanel.Dock="Left"/>
-            <ComboBox Text="{Binding LoadWorld}" ItemsSource="{Binding WorldPaths}" IsEditable="True" Margin="3"/>
+    <DockPanel>
+        <DockPanel DockPanel.Dock="Top">
+            <Label Content="World:" DockPanel.Dock="Left" />
+            <ComboBox Text="{Binding LoadWorld}" ItemsSource="{Binding WorldPaths}" IsEditable="True" Margin="3" />
         </DockPanel>
-        <DockPanel>
-            <StackPanel Margin="3" DockPanel.Dock="Left">
-                <Label Content="Server Name"/>
-                <TextBox Text="{Binding ServerName}" Margin="3,0,3,3" Width="130"/>
-                <Label Content="World Name"/>
-                <TextBox Text="{Binding WorldName}" Margin="3,0,3,3" Width="130"/>
-                <Label Content="Whitelist Group ID"/>
-                <TextBox Text="{Binding GroupId}" Margin="3,0,3,3" Width="130"/>
-                <Label Content="Server IP"/>
-                <StackPanel Orientation="Horizontal" Margin="3,0,3,3">
-                    <TextBox Text="{Binding IP}" Width="100" Height="20"/>
-                    <Label Content=":"></Label>
-                    <TextBox Text="{Binding Port}" Width="50" Height="20"/>
+        <DockPanel DockPanel.Dock="Bottom">
+            <ScrollViewer IsEnabled="True">
+                <StackPanel Orientation="Horizontal">
+                    <StackPanel Margin="3" DockPanel.Dock="Left">
+                        <Label Content="Server Name" />
+                        <TextBox Text="{Binding ServerName}" Margin="3,0,3,3" Width="160" />
+                        <Label Content="World Name" />
+                        <TextBox Text="{Binding WorldName}" Margin="3,0,3,3" Width="160" />
+                        <Label Content="Whitelist Group ID" />
+                        <TextBox Text="{Binding GroupId}" Margin="3,0,3,3" Width="160" />
+                        <Label Content="Server IP" />
+                        <StackPanel Orientation="Horizontal" Margin="3,0,3,3">
+                            <TextBox Text="{Binding IP}" Width="100" Height="20" />
+                            <Label Content=":" Width="12"/>
+                            <TextBox Text="{Binding Port}" Width="48" Height="20" />
+                        </StackPanel>
+                        <CheckBox IsChecked="{Binding IgnoreLastSession}" Content="Ignore Last Session" Margin="3" />
+                        <CheckBox IsChecked="{Binding PauseGameWhenEmpty}" Content="Pause When Empty" Margin="3" />
+                    </StackPanel>
+                    <StackPanel Margin="3">
+                        <Label Content="Banned Players" />
+                        <ListBox ItemsSource="{Binding Banned}" Width="130" Margin="3,0,3,3" Height="100"
+                                 MouseDoubleClick="Banned_OnMouseDoubleClick" />
+                        <Label Content="Administrators" />
+                        <ListBox ItemsSource="{Binding Administrators}" Width="130" Margin="3,0,3,3" Height="100"
+                                 MouseDoubleClick="Administrators_OnMouseDoubleClick" />
+                        <Label Content="Mods" />
+                        <ListBox ItemsSource="{Binding Mods}" Width="130" Margin="3,0,3,3" Height="100"
+                                 MouseDoubleClick="Mods_OnMouseDoubleClick" />
+                    </StackPanel>
                 </StackPanel>
-                <Label Content="Steam Port"/>
-                <TextBox Text="{Binding SteamPort}" Width="130" Margin="3,0,3,3"/>
-                <CheckBox IsChecked="{Binding IgnoreLastSession}" Content="Ignore Last Session" Margin="3"/>
-                <CheckBox IsChecked="{Binding PauseGameWhenEmpty}" Content="Pause When Empty" Margin="3"/>
-                <Label Content="Banned Players"/>
-                <ListBox ItemsSource="{Binding Banned}" Width="130" Margin="3,0,3,3" Height="100" MouseDoubleClick="Banned_OnMouseDoubleClick"/>
-                <Label Content="Administrators"/>
-                <ListBox ItemsSource="{Binding Administrators}" Width="130" Margin="3,0,3,3" Height="100" MouseDoubleClick="Administrators_OnMouseDoubleClick"/>
-                <Label Content="Mods"/>
-                <ListBox ItemsSource="{Binding Mods}" Width="130" Margin="3,0,3,3" Height="100" MouseDoubleClick="Mods_OnMouseDoubleClick"/>
-            </StackPanel>
-            <ScrollViewer Margin="3" DockPanel.Dock="Right" Height="700">
+            </ScrollViewer>
+            <ScrollViewer Margin="3" DockPanel.Dock="Right" IsEnabled="True">
                 <StackPanel DataContext="{Binding SessionSettings}">
                     <Expander Header="Multipliers">
                         <StackPanel Margin="10,0,0,0">
                             <DockPanel>
-                                <TextBox Text="{Binding InventorySizeMultiplier}" Margin="3" Width="70"/>
-                                <Label Content="Inventory Size"/>
+                                <TextBox Text="{Binding InventorySizeMultiplier}" Margin="3" Width="70" />
+                                <Label Content="Inventory Size" />
                             </DockPanel>
                             <DockPanel>
-                                <TextBox Text="{Binding RefinerySpeedMultiplier}" Margin="3" Width="70"/>
-                                <Label Content="Refinery Speed"/>
+                                <TextBox Text="{Binding RefinerySpeedMultiplier}" Margin="3" Width="70" />
+                                <Label Content="Refinery Speed" />
                             </DockPanel>
                             <DockPanel>
-                                <TextBox Text="{Binding AssemblerEfficiencyMultiplier}" Margin="3" Width="70"/>
-                                <Label Content="Assembler Efficiency"/>
+                                <TextBox Text="{Binding AssemblerEfficiencyMultiplier}" Margin="3" Width="70" />
+                                <Label Content="Assembler Efficiency" />
                             </DockPanel>
                             <DockPanel>
-                                <TextBox Text="{Binding AssemblerSpeedMultiplier}" Margin="3" Width="70"/>
-                                <Label Content="Assembler Speed"/>
+                                <TextBox Text="{Binding AssemblerSpeedMultiplier}" Margin="3" Width="70" />
+                                <Label Content="Assembler Speed" />
                             </DockPanel>
                             <DockPanel>
-                                <TextBox Text="{Binding GrinderSpeedMultiplier}" Margin="3" Width="70"/>
-                                <Label Content="Grinder Speed"/>
+                                <TextBox Text="{Binding GrinderSpeedMultiplier}" Margin="3" Width="70" />
+                                <Label Content="Grinder Speed" />
                             </DockPanel>
                             <DockPanel>
-                                <TextBox Text="{Binding HackSpeedMultiplier}" Margin="3" Width="70"/>
-                                <Label Content="Hacking Speed"/>
+                                <TextBox Text="{Binding HackSpeedMultiplier}" Margin="3" Width="70" />
+                                <Label Content="Hacking Speed" />
                             </DockPanel>
                         </StackPanel>
                     </Expander>
                     <Expander Header="NPCs">
                         <StackPanel Margin="10,0,0,0">
-                            <CheckBox IsChecked="{Binding EnableDrones}" Content="Enable Drones" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableEncounters}" Content="Enable Encounters" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableSpiders}" Content="Enable Spiders" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableWolves}" Content="Enable Wolves" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableCargoShips}" Content="Enable Cargo Ships" Margin="3"/>
+                            <CheckBox IsChecked="{Binding EnableDrones}" Content="Enable Drones" Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableEncounters}" Content="Enable Encounters" Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableSpiders}" Content="Enable Spiders" Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableWolves}" Content="Enable Wolves" Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableCargoShips}" Content="Enable Cargo Ships" Margin="3" />
                         </StackPanel>
                     </Expander>
                     <Expander Header="Environment">
                         <StackPanel Margin="10,0,0,0">
-                            <CheckBox IsChecked="{Binding EnableRealisticSound}" Content="Enable Realistic Sound" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableAirtightness}" Content="Enable Airtightness" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableOxygen}" Content="Enable Oxygen" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableDestructibleBlocks}" Content="Enable Destructible Blocks" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableToolShake}" Content="Enable Tool Shake" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableVoxelDestruction}" Content="Enable Voxel Destruction" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableSunRotation}" Content="Enable Sun Rotation" Margin="3"/>
+                            <CheckBox IsChecked="{Binding EnableRealisticSound}" Content="Enable Realistic Sound"
+                                      Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableAirtightness}" Content="Enable Airtightness" Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableOxygen}" Content="Enable Oxygen" Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableDestructibleBlocks}"
+                                      Content="Enable Destructible Blocks" Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableToolShake}" Content="Enable Tool Shake" Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableVoxelDestruction}" Content="Enable Voxel Destruction"
+                                      Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableSunRotation}" Content="Enable Sun Rotation" Margin="3" />
                             <DockPanel>
-                                <TextBox Text="{Binding SunRotationInterval}" Margin="3" Width="70"/>
-                                <Label Content="Sun Rotation Interval (mins)"/>
+                                <TextBox Text="{Binding SunRotationInterval}" Margin="3" Width="70" />
+                                <Label Content="Sun Rotation Interval (mins)" />
                             </DockPanel>
-                            <CheckBox IsChecked="{Binding EnableFlora}" Content="Enable Flora" Margin="3"/>
+                            <CheckBox IsChecked="{Binding EnableFlora}" Content="Enable Flora" Margin="3" />
                             <DockPanel>
-                                <TextBox Text="{Binding FloraDensity}" Margin="3" Width="70"/>
-                                <Label Content="Flora Density"/>
+                                <TextBox Text="{Binding FloraDensity}" Margin="3" Width="70" />
+                                <Label Content="Flora Density" />
                             </DockPanel>
                             <DockPanel>
-                                <TextBox Text="{Binding FloraDensityMultiplier}" Margin="3" Width="70"/>
-                                <Label Content="Flora Density Multiplier"/>
+                                <TextBox Text="{Binding FloraDensityMultiplier}" Margin="3" Width="70" />
+                                <Label Content="Flora Density Multiplier" />
                             </DockPanel>
                             <DockPanel>
-                                <TextBox Text="{Binding ViewDistance}" Margin="3" Width="70"/>
-                                <Label Content="View Distance (meters)"/>
+                                <TextBox Text="{Binding ViewDistance}" Margin="3" Width="70" />
+                                <Label Content="View Distance (meters)" />
                             </DockPanel>
                             <DockPanel>
-                                <TextBox Text="{Binding WorldSize}" Margin="3" Width="70"/>
-                                <Label Content="World Size (km)"/>
+                                <TextBox Text="{Binding WorldSize}" Margin="3" Width="70" />
+                                <Label Content="World Size (km)" />
                             </DockPanel>
                             <DockPanel>
-                                <ComboBox SelectedItem="{Binding EnvironmentHostility}" ItemsSource="{Binding EnvironmentHostilityValues}" Margin="3" Width="100" DockPanel.Dock="Left"/>
-                                <Label Content="Environment Hostility"></Label>
+                                <ComboBox SelectedItem="{Binding EnvironmentHostility}"
+                                          ItemsSource="{Binding EnvironmentHostilityValues}" Margin="3" Width="100"
+                                          DockPanel.Dock="Left" />
+                                <Label Content="Environment Hostility" />
                             </DockPanel>
                         </StackPanel>
                     </Expander>
                     <Expander Header="Players">
                         <StackPanel Margin="10,0,0,0">
                             <DockPanel>
-                                <TextBox Text="{Binding MaxPlayers}" Margin="3" Width="70"/>
-                                <Label Content="Max Players"/>
+                                <TextBox Text="{Binding MaxPlayers}" Margin="3" Width="70" />
+                                <Label Content="Max Players" />
                             </DockPanel>
-                            <CheckBox IsChecked="{Binding EnableAutoHealing}" Content="Auto Healing" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableCopyPaste}" Content="Enable Copy/Paste" Margin="3"/>
-                            <CheckBox IsChecked="{Binding ShowPlayerNamesOnHud}" Content="Show Player Names on HUD" Margin="3"/>
+                            <CheckBox IsChecked="{Binding EnableAutoHealing}" Content="Auto Healing" Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableCopyPaste}" Content="Enable Copy/Paste" Margin="3" />
+                            <CheckBox IsChecked="{Binding ShowPlayerNamesOnHud}" Content="Show Player Names on HUD"
+                                      Margin="3" />
                             <DockPanel>
-                                <TextBox Text="{Binding SpawnTimeMultiplier}" Margin="3" Width="70"/>
-                                <Label Content="Respawn Time Multiplier"/>
+                                <TextBox Text="{Binding SpawnTimeMultiplier}" Margin="3" Width="70" />
+                                <Label Content="Respawn Time Multiplier" />
                             </DockPanel>
                         </StackPanel>
                     </Expander>
                     <Expander Header="Miscellaneous">
                         <StackPanel Margin="10,0,0,0">
                             <DockPanel>
-                                <TextBox Text="{Binding AutosaveInterval}" Margin="3" Width="70"/>
-                                <Label Content="Autosave Interval (minutes)"/>
+                                <TextBox Text="{Binding AutosaveInterval}" Margin="3" Width="70" />
+                                <Label Content="Autosave Interval (minutes)" />
                             </DockPanel>
-                            <CheckBox IsChecked="{Binding EnableThirdPerson}" Content="Enable 3rd Person Camera" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableConvertToStation}" Content="Enable Convert to Station" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableJetpack}" Content="Enable Jetpack" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableRemoteOwnerRemoval}" Content="Enable Remote Ownership Removal" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableRespawnShips}" Content="Enable Respawn Ships" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableScripterRole}" Content="Enable Scripter Role" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableSpectator}" Content="Enable Spectator Camera" Margin="3"/>
-                            <CheckBox IsChecked="{Binding ResetOwnership}" Content="Reset Ownership" Margin="3"/>
-                            <CheckBox IsChecked="{Binding DeleteRespawnShips}" Content="Remove Respawn Ships on Logoff" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableThrusterDamage}" Content="Enable Thruster Damage" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableWeapons}" Content="Enable Weapons" Margin="3"/>
-                            <CheckBox IsChecked="{Binding EnableIngameScripts}" Content="Enable Ingame Scripts" Margin="3"/>
-                            <CheckBox IsChecked="{Binding SpawnWithTools}" Content="Spawn With Tools" Margin="3"/>
+                            <CheckBox IsChecked="{Binding EnableThirdPerson}" Content="Enable 3rd Person Camera"
+                                      Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableConvertToStation}" Content="Enable Convert to Station"
+                                      Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableJetpack}" Content="Enable Jetpack" Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableRemoteOwnerRemoval}"
+                                      Content="Enable Remote Ownership Removal" Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableRespawnShips}" Content="Enable Respawn Ships"
+                                      Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableScripterRole}" Content="Enable Scripter Role"
+                                      Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableSpectator}" Content="Enable Spectator Camera"
+                                      Margin="3" />
+                            <CheckBox IsChecked="{Binding ResetOwnership}" Content="Reset Ownership" Margin="3" />
+                            <CheckBox IsChecked="{Binding DeleteRespawnShips}" Content="Remove Respawn Ships on Logoff"
+                                      Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableThrusterDamage}" Content="Enable Thruster Damage"
+                                      Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableWeapons}" Content="Enable Weapons" Margin="3" />
+                            <CheckBox IsChecked="{Binding EnableIngameScripts}" Content="Enable Ingame Scripts"
+                                      Margin="3" />
+                            <CheckBox IsChecked="{Binding SpawnWithTools}" Content="Spawn With Tools" Margin="3" />
                             <DockPanel>
-                                <ComboBox SelectedItem="{Binding GameMode}" ItemsSource="{Binding GameModeValues}" Margin="3" Width="100" DockPanel.Dock="Left"/>
-                                <Label Content="Game Mode"></Label>
+                                <ComboBox SelectedItem="{Binding GameMode}" ItemsSource="{Binding GameModeValues}"
+                                          Margin="3" Width="100" DockPanel.Dock="Left" />
+                                <Label Content="Game Mode" />
                             </DockPanel>
                             <DockPanel>
-                                <TextBox Text="{Binding MaxBackupSaves}" Margin="3" Width="70"/>
-                                <Label Content="Max Backup Saves"/>
+                                <TextBox Text="{Binding MaxBackupSaves}" Margin="3" Width="70" />
+                                <Label Content="Max Backup Saves" />
                             </DockPanel>
                             <DockPanel>
-                                <TextBox Text="{Binding MaxBlocksPerPlayer}" Margin="3" Width="70"/>
-                                <Label Content="Max Blocks Per Player"/>
+                                <TextBox Text="{Binding MaxBlocksPerPlayer}" Margin="3" Width="70" />
+                                <Label Content="Max Blocks Per Player" />
                             </DockPanel>
                             <DockPanel>
-                                <TextBox Text="{Binding MaxFloatingObjects}" Margin="3" Width="70"/>
-                                <Label Content="Max Floating Objects"/>
+                                <TextBox Text="{Binding MaxFloatingObjects}" Margin="3" Width="70" />
+                                <Label Content="Max Floating Objects" />
                             </DockPanel>
                             <DockPanel>
-                                <TextBox Text="{Binding MaxGridSize}" Margin="3" Width="70"/>
-                                <Label Content="Max Grid Size"/>
+                                <TextBox Text="{Binding MaxGridSize}" Margin="3" Width="70" />
+                                <Label Content="Max Grid Size" />
                             </DockPanel>
-                            
+
                             <DockPanel ToolTip="Increases physics precision at the cost of performance.">
-                                <TextBox Text="{Binding PhysicsIterations}" Margin="3" Width="70"/>
-                                <Label Content="Physics Iterations"/>
+                                <TextBox Text="{Binding PhysicsIterations}" Margin="3" Width="70" />
+                                <Label Content="Physics Iterations" />
                             </DockPanel>
-                            
+
                         </StackPanel>
                     </Expander>
                 </StackPanel>
             </ScrollViewer>
         </DockPanel>
-    </StackPanel>
-</UserControl>
-
+    </DockPanel>
+</UserControl>
\ No newline at end of file
diff --git a/Torch.Server/Views/PluginsControl.xaml b/Torch.Server/Views/PluginsControl.xaml
index 1b7261d..b2229d7 100644
--- a/Torch.Server/Views/PluginsControl.xaml
+++ b/Torch.Server/Views/PluginsControl.xaml
@@ -11,16 +11,19 @@
         <viewModels:PluginManagerViewModel/>
     </UserControl.DataContext>
     <DockPanel>
-        <ListView Width="150" ItemsSource="{Binding Plugins}" SelectedItem="{Binding SelectedPlugin}" Margin="3">
-            <ListView.ItemTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding Name}"/>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
+        <DockPanel>
+            <Button Content="Open Folder" Margin="3" DockPanel.Dock="Bottom" IsEnabled="false"></Button>
+            <ListView Width="150" ItemsSource="{Binding Plugins}" SelectedItem="{Binding SelectedPlugin}" Margin="3">
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Name}"/>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+        </DockPanel>
         <StackPanel Margin="3">
             <Label Content="{Binding SelectedPlugin.Name}" FontSize="16"/>
-            <Frame Content="{Binding SelectedPlugin.Control}"/>
+            <Frame NavigationUIVisibility="Hidden" Content="{Binding SelectedPlugin.Control}"/>
         </StackPanel>
     </DockPanel>
 </UserControl>
diff --git a/Torch.Server/Views/PropertyGrid.xaml b/Torch.Server/Views/PropertyGrid.xaml
new file mode 100644
index 0000000..28d01e6
--- /dev/null
+++ b/Torch.Server/Views/PropertyGrid.xaml
@@ -0,0 +1,15 @@
+<UserControl x:Class="Torch.Server.Views.PropertyGrid"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Torch.Server.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <DataGrid x:Name="Grid" AutoGenerateColumns="False">
+        <DataGrid.Columns>
+            <DataGridTextColumn x:Name="NameCol" Width="1*" Header="Name" Binding="{Binding Name}" IsReadOnly="True"/>
+            <DataGridTemplateColumn x:Name="ValCol" Width="1*" Header="Value"/>
+        </DataGrid.Columns>
+    </DataGrid>
+</UserControl>
diff --git a/Torch.Server/Views/PropertyGrid.xaml.cs b/Torch.Server/Views/PropertyGrid.xaml.cs
new file mode 100644
index 0000000..f26fef4
--- /dev/null
+++ b/Torch.Server/Views/PropertyGrid.xaml.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Torch.Server.Views
+{
+    /// <summary>
+    /// Interaction logic for PropertyGrid.xaml
+    /// </summary>
+    public partial class PropertyGrid : UserControl
+    {
+        public PropertyGrid()
+        {
+            InitializeComponent();
+        }
+
+        public void SetObject(object obj)
+        {
+            var props = obj.GetType().GetProperties();
+            foreach (var prop in props)
+            {
+                var p = prop.GetValue(obj);
+                Grid.Items.Add(new PropertyView(p, prop.Name));
+            }
+        }
+    }
+
+    public class PropertyView : ViewModel
+    {
+        private object _obj;
+
+        public string Name { get; }
+        public string Value { get { return _obj.ToString(); } }
+        public DataTemplate ValueEditTemplate;
+
+        public PropertyView(object obj, string name)
+        {
+            Name = name;
+            _obj = obj;
+
+            ValueEditTemplate = new DataTemplate();
+        }
+    }
+
+    /*
+    public class PropertyGridDataTemplateSelector : DataTemplateSelector
+    {
+        public override DataTemplate SelectTemplate(object item, DependencyObject container)
+        {
+            if (item is IEnumerable)
+            {
+                
+            }
+        }
+    }*/
+}
diff --git a/Torch.Server/Views/TorchUI.xaml b/Torch.Server/Views/TorchUI.xaml
index 6be87f3..c8dd984 100644
--- a/Torch.Server/Views/TorchUI.xaml
+++ b/Torch.Server/Views/TorchUI.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:Torch.Server"
         xmlns:views="clr-namespace:Torch.Server.Views"
         mc:Ignorable="d"
-        Title="Torch" Height="600" Width="800">
+        Title="Torch" Height="800" Width="800">
     <DockPanel>
         <StackPanel DockPanel.Dock="Top" Margin="5,5,5,5" Orientation="Horizontal">
             <Button x:Name="BtnStart" Content="Start" Height="24" Width="75" Margin="5,0,5,0" HorizontalAlignment="Left" Click="BtnStart_Click" IsDefault="True"/>
@@ -17,13 +17,13 @@
         </StackPanel>
         <TabControl x:Name="TabControl" DockPanel.Dock="Bottom" Margin="5,0,5,5">
             <TabItem Header="Configuration">
-                <StackPanel>
-                    <DockPanel>
+                <DockPanel>
+                    <DockPanel DockPanel.Dock="Top">
                         <Label Content="Instance Path: " Margin="3"/>
                         <TextBox x:Name="InstancePathBox" Margin="3" Height="20" TextChanged="InstancePathBox_OnTextChanged"/>
                     </DockPanel>
-                    <views:ConfigControl x:Name="ConfigControl" Margin="3"/>
-                </StackPanel>
+                    <views:ConfigControl x:Name="ConfigControl" Margin="3" DockPanel.Dock="Bottom"/>
+                </DockPanel>
             </TabItem>
             <TabItem Header="Chat/Players">
                 <DockPanel>
diff --git a/Torch.Server/Views/WorldSelectControl.xaml b/Torch.Server/Views/WorldSelectControl.xaml
new file mode 100644
index 0000000..1c213b1
--- /dev/null
+++ b/Torch.Server/Views/WorldSelectControl.xaml
@@ -0,0 +1,12 @@
+<UserControl x:Class="Torch.Server.Views.WorldSelectControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Torch.Server.Views"
+             mc:Ignorable="d" >
+    <DockPanel>
+        <Label Content="World: "/>
+        <ComboBox x:Name="WorldList" IsEditable="True" Margin="3"/>
+    </DockPanel>
+</UserControl>
diff --git a/Torch.Server/Views/WorldSelectControl.xaml.cs b/Torch.Server/Views/WorldSelectControl.xaml.cs
new file mode 100644
index 0000000..de546fc
--- /dev/null
+++ b/Torch.Server/Views/WorldSelectControl.xaml.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Sandbox.Game.Gui;
+
+namespace Torch.Server.Views
+{
+    /// <summary>
+    /// Interaction logic for WorldSelectControl.xaml
+    /// </summary>
+    public partial class WorldSelectControl : UserControl
+    {
+        public WorldSelectControl()
+        {
+            InitializeComponent();
+            //LoadWorlds();
+        }
+
+        public void LoadWorlds(string path = null)
+        {
+            WorldList.Items.Clear();
+            var worlds = new MyLoadWorldInfoListResult(path);
+            worlds.Task.Wait();
+
+            foreach (var world in worlds.AvailableSaves)
+            {
+                WorldList.Items.Add(world.Item1);
+            }
+        }
+    }
+}
diff --git a/Torch/Commands/Command.cs b/Torch/Commands/Command.cs
index c0b7291..74cc11c 100644
--- a/Torch/Commands/Command.cs
+++ b/Torch/Commands/Command.cs
@@ -21,10 +21,11 @@ namespace Torch.Commands
         public Type Module { get; }
         public List<string> Path { get; } = new List<string>();
         public ITorchPlugin Plugin { get; }
+        public string SyntaxHelp { get; }
+
         private readonly MethodInfo _method;
         private ParameterInfo[] _parameters;
         private int? _requiredParamCount;
-        public string SyntaxHelp { get; }
 
         public Command(ITorchPlugin plugin, MethodInfo commandMethod)
         {
@@ -76,7 +77,7 @@ namespace Torch.Commands
                 }
             }
 
-            _requiredParamCount = _requiredParamCount ?? 0;
+            _requiredParamCount = _requiredParamCount ?? _parameters.Length;
             LogManager.GetLogger(nameof(Command)).Debug($"Params: {_parameters.Length} ({_requiredParamCount} required)");
             SyntaxHelp = sb.ToString();
         }
@@ -97,7 +98,7 @@ namespace Torch.Commands
                     return false;
             }
 
-            //Fill omitted default parameters
+            //Fill remaining parameters with default values
             for (var i = 0; i < parameters.Length; i++)
             {
                 if (parameters[i] == null)
@@ -109,13 +110,6 @@ namespace Torch.Commands
             _method.Invoke(moduleInstance, parameters);
             return true;
         }
-
-        public void Invoke(CommandContext context)
-        {
-            var moduleInstance = (CommandModule)Activator.CreateInstance(Module);
-            moduleInstance.Context = context;
-            _method.Invoke(moduleInstance, null);
-        }
     }
 
     public static class Extensions
diff --git a/Torch/Commands/CommandManager.cs b/Torch/Commands/CommandManager.cs
index 487ae55..a7f1b5f 100644
--- a/Torch/Commands/CommandManager.cs
+++ b/Torch/Commands/CommandManager.cs
@@ -100,11 +100,13 @@ namespace Torch.Commands
                 var splitArgs = Regex.Matches(argText, "(\"[^\"]+\"|\\S+)").Cast<Match>().Select(x => x.ToString().Replace("\"", "")).ToList();
                 _log.Trace($"Invoking {cmdPath} for player {player.DisplayName}");
                 var context = new CommandContext(_torch, command.Plugin, player, argText, splitArgs);
-                //command.Invoke(context);
-                if (command.TryInvoke(context))
-                    _log.Info($"Player {player.DisplayName} ran command '{msg.Text}'");
-                else
-                    context.Respond($"Invalid Syntax: {command.SyntaxHelp}");
+                _torch.Invoke(() =>
+                {
+                    if (command.TryInvoke(context))
+                        _log.Info($"Player {player.DisplayName} ran command '{msg.Text}'");
+                    else
+                        context.Respond($"Invalid Syntax: {command.SyntaxHelp}");
+                });
             }
         }
     }
diff --git a/Torch/Managers/ChatManager.cs b/Torch/Managers/ChatManager.cs
index 89ec076..2edbe20 100644
--- a/Torch/Managers/ChatManager.cs
+++ b/Torch/Managers/ChatManager.cs
@@ -27,10 +27,7 @@ namespace Torch.Managers
 
         public void Init()
         {
-            //HACK
-            MyMultiplayer.Static.ChatMessageReceived += Static_ChatMessageReceived;
-            _log.Warn("Chat intercept broken, chat hiding will not work!");
-            //NetworkManager.Instance.RegisterNetworkHandlers(new ChatIntercept());
+            NetworkManager.Instance.RegisterNetworkHandlers(new ChatIntercept());
         }
 
         private void Static_ChatMessageReceived(ulong arg1, string arg2, SteamSDK.ChatEntryTypeEnum arg3)
@@ -70,28 +67,6 @@ namespace Torch.Managers
 
         public override bool Handle(ulong remoteUserId, CallSite site, BitStream stream, object obj, MyPacket packet)
         {
-            /*
-            var msg = new ChatMsg();
-
-            var msgLength = stream.ByteLength - stream.BytePosition - 8;
-            var bytes = new byte[msgLength];
-            stream.ReadBytes(bytes, stream.BytePosition, msgLength);
-
-            msg.Text = Encoding.Unicode.GetString(bytes);
-            msg.Author = stream.ReadUInt64();
-
-            var log = LogManager.GetLogger("HandleDebug");
-            var sb = new StringBuilder();
-
-            foreach (char c in msg.Text.ToCharArray())
-            {
-                sb.Append(Convert.ToString(c, 2).PadLeft(16, '0'));
-            }
-
-            log.Debug(sb.ToString());*/
-            //stream.ResetRead(packet);
-            //var msg = MySerializer.CreateAndRead<ChatMsg>(stream);
-
             var msg = new ChatMsg();
             Serialize(site.MethodInfo, stream, ref msg);
 
diff --git a/Torch/Managers/EntityManager.cs b/Torch/Managers/EntityManager.cs
index b977e58..1cae748 100644
--- a/Torch/Managers/EntityManager.cs
+++ b/Torch/Managers/EntityManager.cs
@@ -75,6 +75,7 @@ namespace Torch.Managers
 
         public void InitConcealment(double concealInterval)
         {
+            return;
             Log.Info($"Initializing concealment to run every {concealInterval}ms");
             _concealedAabbTree = new MyDynamicAABBTreeD(MyConstants.GAME_PRUNING_STRUCTURE_AABB_EXTENSION);
             _concealTimer = new Timer(concealInterval);
diff --git a/Torch/Managers/NetworkManager/NetworkManager.cs b/Torch/Managers/NetworkManager/NetworkManager.cs
index 2418852..ab81614 100644
--- a/Torch/Managers/NetworkManager/NetworkManager.cs
+++ b/Torch/Managers/NetworkManager/NetworkManager.cs
@@ -116,7 +116,7 @@ namespace Torch.Managers
             var networkId = stream.ReadNetworkId();
             //this value is unused, but removing this line corrupts the rest of the stream
             var blockedNetworkId = stream.ReadNetworkId();
-            var eventId = (uint)stream.ReadByte();
+            var eventId = (uint)stream.ReadInt16();
 
 
             CallSite site;
@@ -152,7 +152,8 @@ namespace Torch.Managers
 
             //we're handling the network live in the game thread, this needs to go as fast as possible
             var discard = false;
-            Parallel.ForEach(_networkHandlers, handler =>
+            foreach (var handler in _networkHandlers)
+            //Parallel.ForEach(_networkHandlers, handler =>
             {
                 try
                 {
@@ -164,7 +165,7 @@ namespace Torch.Managers
                     //ApplicationLog.Error(ex.ToString());
                     _log.Error(ex);
                 }
-            });
+            };
 
             //one of the handlers wants us to discard this packet
             if (discard)
diff --git a/Torch/PluginManifest.cs b/Torch/PluginManifest.cs
new file mode 100644
index 0000000..ea739dc
--- /dev/null
+++ b/Torch/PluginManifest.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Torch
+{
+    public class PluginManifest
+    {
+        public string Repository { get; set; }
+        public string Version { get; set; }
+    }
+}
diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj
index 200607e..03d7a31 100644
--- a/Torch/Torch.csproj
+++ b/Torch/Torch.csproj
@@ -32,48 +32,37 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HavokWrapper, Version=1.0.6278.22649, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\GameBinaries\HavokWrapper.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.4.1\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Sandbox.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\Sandbox.Common.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="Octokit, Version=0.24.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Octokit.0.24.0\lib\net45\Octokit.dll</HintPath>
     </Reference>
-    <Reference Include="Sandbox.Game, Version=0.1.6108.20542, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\Sandbox.Game.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="Sandbox.Common">
+      <HintPath>..\GameBinaries\Sandbox.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Sandbox.Graphics, Version=0.1.6108.20417, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\Sandbox.Graphics.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="Sandbox.Game">
+      <HintPath>..\GameBinaries\Sandbox.Game.dll</HintPath>
     </Reference>
-    <Reference Include="SpaceEngineers.Game, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\SpaceEngineers.Game.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="Sandbox.Graphics">
+      <HintPath>..\GameBinaries\Sandbox.Graphics.dll</HintPath>
     </Reference>
-    <Reference Include="SpaceEngineers.ObjectBuilders, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\SpaceEngineers.ObjectBuilders.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="SpaceEngineers.Game">
+      <HintPath>..\GameBinaries\SpaceEngineers.Game.dll</HintPath>
     </Reference>
-    <Reference Include="SpaceEngineers.ObjectBuilders.XmlSerializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\SpaceEngineers.ObjectBuilders.XmlSerializers.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="SpaceEngineers.ObjectBuilders">
+      <HintPath>..\GameBinaries\SpaceEngineers.ObjectBuilders.dll</HintPath>
     </Reference>
-    <Reference Include="SpaceEngineersDedicated">
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\DedicatedServer64\SpaceEngineersDedicated.exe</HintPath>
-      <Private>False</Private>
+    <Reference Include="SpaceEngineers.ObjectBuilders.XmlSerializers">
+      <HintPath>..\GameBinaries\SpaceEngineers.ObjectBuilders.XmlSerializers.dll</HintPath>
     </Reference>
-    <Reference Include="SteamSDK, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\SteamSDK.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="SteamSDK">
+      <HintPath>..\GameBinaries\SteamSDK.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -83,64 +72,44 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="VRage, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="VRage">
+      <HintPath>..\GameBinaries\VRage.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Audio, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Audio.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="VRage.Audio">
+      <HintPath>..\GameBinaries\VRage.Audio.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Game, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Game.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="VRage.Dedicated">
+      <HintPath>..\GameBinaries\VRage.Dedicated.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Game.XmlSerializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Game.XmlSerializers.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="VRage.Game">
+      <HintPath>..\GameBinaries\VRage.Game.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Input, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Input.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="VRage.Game.XmlSerializers">
+      <HintPath>..\GameBinaries\VRage.Game.XmlSerializers.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Library.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="VRage.Input">
+      <HintPath>..\GameBinaries\VRage.Input.dll</HintPath>
+    </Reference>
+    <Reference Include="VRage.Library">
+      <HintPath>..\GameBinaries\VRage.Library.dll</HintPath>
     </Reference>
     <Reference Include="VRage.Math">
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Math.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\GameBinaries\VRage.Math.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Native, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Native.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="VRage.Native">
+      <HintPath>..\GameBinaries\VRage.Native.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.OpenVRWrapper, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.OpenVRWrapper.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="VRage.OpenVRWrapper">
+      <HintPath>..\GameBinaries\VRage.OpenVRWrapper.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Render, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Render.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="VRage.Render">
+      <HintPath>..\GameBinaries\VRage.Render.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Render11, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Render11.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="VRage.Render11">
+      <HintPath>..\GameBinaries\VRage.Render11.dll</HintPath>
     </Reference>
-    <Reference Include="VRage.Scripting, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\SpaceEngineers\Bin64\VRage.Scripting.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="VRage.Scripting">
+      <HintPath>..\GameBinaries\VRage.Scripting.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
   </ItemGroup>
@@ -162,6 +131,7 @@
     <Compile Include="Managers\NetworkManager\NetworkHandlerBase.cs" />
     <Compile Include="Managers\NetworkManager\NetworkManager.cs" />
     <Compile Include="Managers\MultiplayerManager.cs" />
+    <Compile Include="PluginManifest.cs" />
     <Compile Include="PluginOptions.cs" />
     <Compile Include="Reflection.cs" />
     <Compile Include="Managers\ScriptingManager.cs" />
@@ -169,6 +139,7 @@
     <Compile Include="SteamService.cs" />
     <Compile Include="TorchConfig.cs" />
     <Compile Include="TorchPluginBase.cs" />
+    <Compile Include="Updater\PluginUpdater.cs" />
     <Compile Include="ViewModels\ModViewModel.cs" />
     <Compile Include="Collections\MTObservableCollection.cs" />
     <Compile Include="Extensions\MyPlayerCollectionExtensions.cs" />
diff --git a/Torch/TorchBase.cs b/Torch/TorchBase.cs
index e1e0216..dea5825 100644
--- a/Torch/TorchBase.cs
+++ b/Torch/TorchBase.cs
@@ -192,7 +192,13 @@ namespace Torch
 
         private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
-            Log.Fatal((Exception)e.ExceptionObject);
+            var ex = (Exception)e.ExceptionObject;
+            Log.Fatal(ex);
+            if (ex is ReflectionTypeLoadException rex)
+            {
+                foreach (var x in rex.LoaderExceptions)
+                    Log.Fatal(x);
+            }
             Console.ReadLine();
             Environment.Exit(-1);
         }
diff --git a/Torch/Updater/PluginUpdater.cs b/Torch/Updater/PluginUpdater.cs
new file mode 100644
index 0000000..5a86593
--- /dev/null
+++ b/Torch/Updater/PluginUpdater.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Octokit;
+
+namespace Torch.Updater
+{
+    public class PluginUpdater
+    {
+        public async Task CheckForUpdate(PluginManifest manifest)
+        {
+            var split = manifest.Repository.Split('/');
+
+            if (split.Length != 2)
+                return;
+
+            var client = new GitHubClient(new ProductHeaderValue("Torch"));
+            var releases = await client.Repository.Release.GetAll(split[0], split[1]);
+            var currentVersion = new Version(manifest.Version);
+            var latestVersion = new Version(releases[0].TagName);
+
+            if (latestVersion > currentVersion)
+            {
+                //update
+            }
+        }
+    }
+}
diff --git a/Torch/packages.config b/Torch/packages.config
index 1c68ff1..18ffc48 100644
--- a/Torch/packages.config
+++ b/Torch/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NLog" version="4.4.1" targetFramework="net461" />
+  <package id="Octokit" version="0.24.0" targetFramework="net461" />
 </packages>
\ No newline at end of file