diff --git a/.gitignore b/.gitignore
index 53b6495..abf6fb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,8 @@ Distance.dll
 x64/
 x86/
 [Bb]uild/
+BuildLinux/
+BuildWindows/
 bld/
 [Bb]in/
 [Oo]bj/
diff --git a/ServerBase/DistanceServer.cs b/ServerBase/DistanceServer.cs
index ed923f8..5468d7c 100644
--- a/ServerBase/DistanceServer.cs
+++ b/ServerBase/DistanceServer.cs
@@ -40,6 +40,9 @@ public int MaxPlayers
             Network.maxConnections = maxPlayers;
         }
     }
+
+    public bool UseNat = false;
+
     public int Port = 45671;
 
     bool reportToMasterServer = false;
@@ -261,6 +264,9 @@ public DistancePlayer GetDistancePlayer(int clientId)
     public LocalEvent<DistancePlayer> OnPlayerValidatedEvent = new LocalEvent<DistancePlayer>();
     public LocalEvent<DistancePlayer> OnPlayerValidatedPreReplicationEvent = new LocalEvent<DistancePlayer>();
 
+    public LocalEvent<NetworkConnectionError> OnFailedToConnectToMasterServerEvent = new LocalEvent<NetworkConnectionError>();
+    public LocalEvent<MasterServerEvent> OnMasterServerEvent = new LocalEvent<MasterServerEvent>();
+
     ///
 
     public void Init()
@@ -448,6 +454,16 @@ public void OnServerInitialized()
         OnServerInitializedEvent.Fire();
     }
 
+    public void OnFailedToConnectToMasterServer(NetworkConnectionError error)
+    {
+        OnFailedToConnectToMasterServerEvent.Fire(error);
+    }
+
+    public void OnMasterServer(MasterServerEvent evt)
+    {
+        OnMasterServerEvent.Fire(evt);
+    }
+
     public void RequestSubmitLobbyInfo(NetworkPlayer player)
     {
         DistanceServerMain.GetEvent<Events.ServerToClient.Request>().Fire(
diff --git a/ServerBase/DistanceServerMain.cs b/ServerBase/DistanceServerMain.cs
index 4649291..f2bf653 100644
--- a/ServerBase/DistanceServerMain.cs
+++ b/ServerBase/DistanceServerMain.cs
@@ -342,9 +342,10 @@ public override void Awake()
         Server.Init();
 
         LoadPlugins();
+        
+        Log.WriteLine($"Starting server version {Server.DistanceVersion} on port {Server.Port} (UseNat: {Server.UseNat})");
 
-        Log.WriteLine($"Starting server version {Server.DistanceVersion} on port {Server.Port}");
-        Network.InitializeServer(Server.MaxPlayers, Server.Port, false);
+        Network.InitializeServer(Server.MaxPlayers, Server.Port, Server.UseNat);
 	}
     
     public List<DistanceServerPlugin> Plugins = new List<DistanceServerPlugin>();
@@ -673,4 +674,14 @@ public override void SubmitServerNetworkTimeSync(NetworkMessageInfo info)
             num2
         });
     }
+
+    public override void OnFailedToConnectToMasterServer(NetworkConnectionError error)
+    {
+        Server.OnFailedToConnectToMasterServer(error);
+    }
+
+    public override void OnMasterServerEvent(MasterServerEvent evt)
+    {
+        Server.OnMasterServer(evt);
+    }
 }
\ No newline at end of file
diff --git a/ServerPlugins/BasicAutoServer/BasicAutoServer.cs b/ServerPlugins/BasicAutoServer/BasicAutoServer.cs
index 5663e42..e2da25e 100644
--- a/ServerPlugins/BasicAutoServer/BasicAutoServer.cs
+++ b/ServerPlugins/BasicAutoServer/BasicAutoServer.cs
@@ -83,6 +83,7 @@ public bool FilterWorkshopLevels(List<DistanceSearchResultItem> results)
         string PrivateServerPassword = null;
         int MaxPlayers = 24;
         int Port = 45671;
+        bool UseNat = false;
         bool ReportToMasterServer = true;
         public double ReportToMasterServerInitialDelay = 0;
         double MasterServerReRegisterFrequency = 5 * 60.0;
@@ -113,6 +114,7 @@ public void ReadSettings()
                 TryGetValue(dictionary, "ServerName", ref ServerName);
                 TryGetValue(dictionary, "MaxPlayers", ref MaxPlayers);
                 TryGetValue(dictionary, "Port", ref Port);
+                TryGetValue(dictionary, "UseNat", ref UseNat);
                 TryGetValue(dictionary, "PrivateServerPassword", ref PrivateServerPassword);
                 TryGetValue(dictionary, "ReportToMasterServer", ref ReportToMasterServer);
                 TryGetValue(dictionary, "ReportToMasterServerInitialDelay", ref ReportToMasterServerInitialDelay);
@@ -212,6 +214,7 @@ public override void Start()
             Server.ServerName = ServerName;
             Server.MaxPlayers = MaxPlayers;
             Server.Port = Port;
+            Server.UseNat = UseNat;
             if (ReportToMasterServerInitialDelay > 0)
             {
                 Server.ReportToMasterServer = false;
diff --git a/ServerPlugins/ServerListTools/Entry.cs b/ServerPlugins/ServerListTools/Entry.cs
new file mode 100644
index 0000000..16f4952
--- /dev/null
+++ b/ServerPlugins/ServerListTools/Entry.cs
@@ -0,0 +1,169 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace ServerListTools
+{
+    public class Entry : DistanceServerPlugin
+    {
+        public override string Author { get; } = "Corecii; Discord: Corecii#3019";
+        public override string DisplayName { get; } = "Server List Tools";
+        public override int Priority { get; } = 100;
+        public override SemanticVersion ServerVersion => new SemanticVersion("0.1.3");
+
+        public double LogServersFrequency = -1.0;
+        public double HealthCheckFrequency = -1.0;
+        public double HealthCheckDelay = 60.0;
+        public double HealthCheckTimeout = 120.0;
+
+        public double LastSuccessfulHealthCheckTime = -1.0;
+
+        public void ReadSettings()
+        {
+            var filePath = new System.IO.FileInfo(Manager.ServerDirectory.FullName + "/ServerListTools.json");
+            if (!filePath.Exists)
+            {
+                Log.Info("No ServerListTools.json, using default settings");
+                return;
+            }
+            try
+            {
+                var txt = System.IO.File.ReadAllText(filePath.FullName);
+                var reader = new JsonFx.Json.JsonReader();
+                var dictionary = (Dictionary<string, object>)reader.Read(txt);
+                TryGetValue(dictionary, "LogServersFrequency", ref LogServersFrequency);
+                TryGetValue(dictionary, "HealthCheckFrequency", ref HealthCheckFrequency);
+                TryGetValue(dictionary, "HealthCheckDelay", ref HealthCheckDelay);
+                TryGetValue(dictionary, "HealthCheckTimeout", ref HealthCheckTimeout);
+                Log.Info("Loaded settings from ServerListTools.json");
+            }
+            catch (Exception e)
+            {
+                Log.Error($"Couldn't read ServerListTools.json. Is your json malformed?\n{e}");
+
+            }
+        }
+
+        bool TryGetValue<T>(Dictionary<string, object> dict, string name, ref T value)
+        {
+            try
+            {
+                value = (T)dict[name];
+                return true;
+            }
+            catch (Exception e)
+            {
+                return false;
+            }
+        }
+
+        public override void Start()
+        {
+            Log.Info("Server List Tools Plugin started!");
+            Log.Info($"My guid: {DistanceServerMain.View.owner.guid}");
+
+            ReadSettings();
+
+            if (LogServersFrequency > 0 || HealthCheckFrequency > 0)
+            {
+                Server.OnUpdateEvent.Connect(() =>
+                {
+                    MasterServer.PollHostList();
+                });
+            }
+
+            if (LogServersFrequency > 0)
+            {
+                Log.Info("Will be logging servers...");
+                DistanceServerMainStarter.Instance.StartCoroutine(LogServers());
+            }
+            if (HealthCheckFrequency > 0)
+            {
+                Log.Info("Will be running health checks...");
+                DistanceServerMainStarter.Instance.StartCoroutine(HealthCheck());
+            }
+        }
+
+        public System.Collections.IEnumerator HealthCheck()
+        {
+            yield return new WaitForSeconds((float)HealthCheckDelay);
+            LastSuccessfulHealthCheckTime = DistanceServerMain.UnixTime;
+            while (true)
+            {
+                if (DistanceServerMain.UnixTime - LastSuccessfulHealthCheckTime > HealthCheckTimeout)
+                {
+                    Log.Error($"Quitting because health check failed: server is not on the master server list");
+                    Application.Quit();
+                }
+                DistanceServerMainStarter.Instance.StartCoroutine(ExitIfNotOnServerList());
+                yield return new WaitForSeconds((float)HealthCheckFrequency);
+            }
+        }
+
+        public System.Collections.IEnumerator LogServers()
+        {
+            while (true)
+            {
+                DistanceServerMainStarter.Instance.StartCoroutine(LogServerList());
+                yield return new WaitForSeconds((float)LogServersFrequency);
+            }
+        }
+
+        public System.Collections.IEnumerator ExitIfNotOnServerList()
+        {
+            MasterServer.ClearHostList();
+            MasterServer.RequestHostList("Distance");
+            yield return new WaitForServerList();
+            var servers = MasterServer.PollHostList();
+            var hasMe = servers.Any((server) =>
+            {
+                return server.guid == DistanceServerMain.View.owner.guid;
+            });
+            if (hasMe)
+            {
+                LastSuccessfulHealthCheckTime = DistanceServerMain.UnixTime;
+            }
+            yield break;
+        }
+
+        public System.Collections.IEnumerator LogServerList()
+        {
+            MasterServer.ClearHostList();
+            MasterServer.RequestHostList("Distance");
+            yield return new WaitForServerList();
+            var servers = MasterServer.PollHostList();
+            var i = 0;
+            Log.Debug("Server list:");
+            foreach (var server in servers)
+            {
+                i++;
+                Log.Debug($"{i}: {String.Join(",", server.ip)}:{server.port} {server.gameName} {server.gameType} {server.connectedPlayers}/{server.playerLimit} {server.useNat} {(server.passwordProtected ? "private" : "public")} {server.comment} {server.guid}");
+            }
+            yield break;
+        }
+    }
+
+    public class WaitForServerList : UnityEngine.CustomYieldInstruction
+    {
+        public override bool keepWaiting => !done;
+
+        bool done = false;
+        LocalEvent<MasterServerEvent>.EventConnection conn;
+
+        public WaitForServerList()
+        {
+            conn = DistanceServerMain.Instance.Server.OnMasterServerEvent.Connect(evt =>
+            {
+                if (evt == MasterServerEvent.HostListReceived)
+                {
+                    conn.Disconnect();
+                    conn = null;
+                    done = true;
+                }
+            });
+        }
+    }
+}
diff --git a/ServerPlugins/ServerListTools/Properties/AssemblyInfo.cs b/ServerPlugins/ServerListTools/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..ba37eee
--- /dev/null
+++ b/ServerPlugins/ServerListTools/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ServerListTools")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ServerListTools")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("77836de9-5b0f-44bb-a70c-c9187a5b7a28")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ServerPlugins/WorkshopSearch/DistanceSearchRetriever.cs b/ServerPlugins/WorkshopSearch/DistanceSearchRetriever.cs
index 8e99809..4a6a42d 100644
--- a/ServerPlugins/WorkshopSearch/DistanceSearchRetriever.cs
+++ b/ServerPlugins/WorkshopSearch/DistanceSearchRetriever.cs
@@ -72,6 +72,11 @@ public System.Collections.IEnumerator Retrieve()
                 }
                 Log.DebugLine("Retrieve");
                 var levelIds = new List<string>();
+
+                if (searchResult.Result == null)
+                {
+                    Log.Warn("HtmlAgilityPack might not be loaded");
+                }
                 foreach (var item in searchResult.Result.Items)
                 {
                     levelIds.Add(item.PublishedFileId);
diff --git a/ServerPlugins/WorkshopSearch/WorkshopSearchRetriever.cs b/ServerPlugins/WorkshopSearch/WorkshopSearchRetriever.cs
index c0d8fbf..a5687b9 100644
--- a/ServerPlugins/WorkshopSearch/WorkshopSearchRetriever.cs
+++ b/ServerPlugins/WorkshopSearch/WorkshopSearchRetriever.cs
@@ -356,6 +356,10 @@ public System.Collections.IEnumerator RetrieveFiles()
             {
                 Finished = true;
                 Error = request.error;
+                if (Error == null)
+                {
+                    Error = "Unkown error";
+                }
                 yield break;
             }
 
@@ -462,6 +466,10 @@ public System.Collections.IEnumerator RetrieveFiles()
             catch (Exception e)
             {
                 Error = e.ToString();
+                if (Error == null)
+                {
+                    Error = "Unkown error";
+                }
             }
 
             Finished = true;
diff --git a/ServerUnity/Assets/DistanceServerMainBase.cs b/ServerUnity/Assets/DistanceServerMainBase.cs
index a318820..23c384b 100644
--- a/ServerUnity/Assets/DistanceServerMainBase.cs
+++ b/ServerUnity/Assets/DistanceServerMainBase.cs
@@ -22,6 +22,8 @@ public GameObject gameObject
     public abstract void OnServerInitialized();
     public abstract void OnPlayerConnected(NetworkPlayer player);
     public abstract void OnPlayerDisconnected(NetworkPlayer player);
+    public abstract void OnFailedToConnectToMasterServer(NetworkConnectionError error);
+    public abstract void OnMasterServerEvent(MasterServerEvent evt);
     public abstract void OnDestroy();
     public abstract void ReceiveBroadcastAllEvent(byte[] bytes, NetworkMessageInfo info);
     public abstract void ReceiveClientToServerEvent(byte[] bytes, NetworkMessageInfo info);
diff --git a/ServerUnity/Assets/DistanceServerMainStarter.cs b/ServerUnity/Assets/DistanceServerMainStarter.cs
index f0ffc20..a3f29b3 100644
--- a/ServerUnity/Assets/DistanceServerMainStarter.cs
+++ b/ServerUnity/Assets/DistanceServerMainStarter.cs
@@ -10,11 +10,37 @@ public class DistanceServerMainStarter : MonoBehaviour {
     public static DistanceServerMainStarter Instance;
     public int StarterVersion = 1;
 
-    void Awake()
+    void Start()
     {
+        var launchArgs = Environment.GetCommandLineArgs();
+        for (var i = 0; i < launchArgs.Length; i++)
+        {
+            var arg = launchArgs[i];
+            if (arg == "-masterserverworkaround")
+            {
+                Debug.Log($"Requesting Distance host list from default master server");
+
+                MasterServer.ipAddress = "54.213.90.85";
+                MasterServer.port = 23466;
+
+                MasterServer.RequestHostList("Distance");
+            }
+        }
+
+        StartCoroutine(LoadSoon());
+    }
+
+    IEnumerator LoadSoon()
+    {
+        yield return new WaitForSeconds(5);
         Instance = this;
         LoadServerBaseExternal();
-	}
+    }
+    
+    void OnMasterServerEvent(MasterServerEvent msEvent)
+    {
+        External?.OnMasterServerEvent(msEvent);
+    }
 
     DistanceServerMainBase External = null;
 
@@ -97,7 +123,12 @@ private void OnDestroy()
     {
         External?.OnDestroy();
     }
-	 
+
+    void OnFailedToConnectToMasterServer(NetworkConnectionError error)
+    {
+        External?.OnFailedToConnectToMasterServer(error);
+    }
+
     [RPC]
     void ReceiveBroadcastAllEvent(byte[] bytes, NetworkMessageInfo info)
     {
diff --git a/ServerUnity/BuildLinux/DistanceServer.x86_64 b/ServerUnity/BuildLinux/DistanceServer.x86_64
index 9d855df..526473f 100644
Binary files a/ServerUnity/BuildLinux/DistanceServer.x86_64 and b/ServerUnity/BuildLinux/DistanceServer.x86_64 differ
diff --git a/ServerUnity/BuildLinux/DistanceServer_Data/Managed/Assembly-CSharp-firstpass.dll b/ServerUnity/BuildLinux/DistanceServer_Data/Managed/Assembly-CSharp-firstpass.dll
index 8356dd3..d13d346 100644
Binary files a/ServerUnity/BuildLinux/DistanceServer_Data/Managed/Assembly-CSharp-firstpass.dll and b/ServerUnity/BuildLinux/DistanceServer_Data/Managed/Assembly-CSharp-firstpass.dll differ
diff --git a/ServerUnity/BuildLinux/DistanceServer_Data/Managed/Assembly-CSharp.dll b/ServerUnity/BuildLinux/DistanceServer_Data/Managed/Assembly-CSharp.dll
index 2a62c76..e2710b4 100644
Binary files a/ServerUnity/BuildLinux/DistanceServer_Data/Managed/Assembly-CSharp.dll and b/ServerUnity/BuildLinux/DistanceServer_Data/Managed/Assembly-CSharp.dll differ
diff --git a/ServerUnity/BuildLinux/DistanceServer_Data/boot.config b/ServerUnity/BuildLinux/DistanceServer_Data/boot.config
index 1aea26b..06ed21a 100644
--- a/ServerUnity/BuildLinux/DistanceServer_Data/boot.config
+++ b/ServerUnity/BuildLinux/DistanceServer_Data/boot.config
@@ -1,3 +1,10 @@
+player-connection-mode=Listen
+player-connection-guid=870278337
+player-connection-debug=1
+player-connection-wait-timeout=-1
+player-connection-ip=172.17.49.241
+player-connection-ip=10.0.0.167
 gfx-enable-native-gfx-jobs=
 wait-for-native-debugger=0
+wait-for-managed-debugger=0
 scripting-runtime-version=latest
diff --git a/ServerUnity/BuildLinux/DistanceServer_Data/data.unity3d b/ServerUnity/BuildLinux/DistanceServer_Data/data.unity3d
index ba9dad6..8e5d14f 100644
Binary files a/ServerUnity/BuildLinux/DistanceServer_Data/data.unity3d and b/ServerUnity/BuildLinux/DistanceServer_Data/data.unity3d differ
diff --git a/ServerUnity/Library/CurrentLayout.dwlt b/ServerUnity/Library/CurrentLayout.dwlt
index b3edcb7..dba24a5 100644
--- a/ServerUnity/Library/CurrentLayout.dwlt
+++ b/ServerUnity/Library/CurrentLayout.dwlt
@@ -20,7 +20,7 @@ MonoBehaviour:
   m_ShowMode: 4
   m_Title: 
   m_RootView: {fileID: 6}
-  m_MinSize: {x: 950, y: 542}
+  m_MinSize: {x: 950, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
 --- !u!114 &2
 MonoBehaviour:
@@ -45,7 +45,7 @@ MonoBehaviour:
   m_MinSize: {x: 683, y: 492}
   m_MaxSize: {x: 14004, y: 14042}
   vertical: 0
-  controlID: 60
+  controlID: 85
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -64,8 +64,8 @@ MonoBehaviour:
     y: 0
     width: 728
     height: 971
-  m_MinSize: {x: 277, y: 71}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 14}
@@ -209,7 +209,7 @@ MonoBehaviour:
   m_MinSize: {x: 406, y: 492}
   m_MaxSize: {x: 10002, y: 14042}
   vertical: 1
-  controlID: 61
+  controlID: 86
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -233,7 +233,7 @@ MonoBehaviour:
   m_MinSize: {x: 406, y: 221}
   m_MaxSize: {x: 8006, y: 4021}
   vertical: 0
-  controlID: 28
+  controlID: 87
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -252,8 +252,8 @@ MonoBehaviour:
     y: 0
     width: 891
     height: 391
-  m_MinSize: {x: 204, y: 221}
-  m_MaxSize: {x: 4004, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
@@ -334,9 +334,9 @@ MonoBehaviour:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 6e2f0000
-    m_LastClickedID: 12142
-    m_ExpandedIDs: 000000006e2f0000da2f00003a30000046300000ba30000000ca9a3bffffff7f
+    m_SelectedIDs: cc090000
+    m_LastClickedID: 2508
+    m_ExpandedIDs: 00000000cc090000380a0000980a0000a40a0000180b000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -364,7 +364,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000006e2f0000da2f00003a30000046300000ba300000
+    m_ExpandedIDs: 00000000cc090000380a0000980a0000a40a0000180b0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -391,7 +391,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: c6230000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -482,7 +482,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: a6eeffff54efffff80f0ffffe4f6ffff00000000
+    m_ExpandedIDs: 4861fffff661ffff1e63ffff326affffe26affff0a6cffff7671ffff2672ffff4e73ffff6e77ffff1e78ffff4679ffffd27fffff8280ffffaa81fffff68affffa48bffffcc8cffff5a92ffff0893ffff3094ffff7a9fffff2aa0ffff52a1ffff8ca5ffff3ca6ffff64a7ffff6caeffff1cafffff44b0ffff86b4ffff36b5ffff5eb6ffff02bbffffb2bbffffdabcffff26c2ffffd6c2fffffec3fffff4caffffa4cbffffccccffff5ed1ffff0ed2ffff36d3ffff34dbffffe4dbffff0cddffffbae2ffff6ae3ffff92e4ffff8ce9ffff3ceaffff64ebffffa6f4ffff54f5ffff7cf6ffffeafbffff00000000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
diff --git a/ServerUnity/Library/EditorUserBuildSettings.asset b/ServerUnity/Library/EditorUserBuildSettings.asset
index 9724517..9f54d25 100644
Binary files a/ServerUnity/Library/EditorUserBuildSettings.asset and b/ServerUnity/Library/EditorUserBuildSettings.asset differ
diff --git a/ServerUnity/Library/LastBuild.buildreport b/ServerUnity/Library/LastBuild.buildreport
index 5cae47a..842fe4c 100644
Binary files a/ServerUnity/Library/LastBuild.buildreport and b/ServerUnity/Library/LastBuild.buildreport differ
diff --git a/ServerUnity/Library/PlayerDataCache/Data/Managed/Assembly-CSharp-firstpass.dll b/ServerUnity/Library/PlayerDataCache/Data/Managed/Assembly-CSharp-firstpass.dll
index 8356dd3..d13d346 100644
Binary files a/ServerUnity/Library/PlayerDataCache/Data/Managed/Assembly-CSharp-firstpass.dll and b/ServerUnity/Library/PlayerDataCache/Data/Managed/Assembly-CSharp-firstpass.dll differ
diff --git a/ServerUnity/Library/PlayerDataCache/Data/Managed/Assembly-CSharp-firstpass.dll.mdb b/ServerUnity/Library/PlayerDataCache/Data/Managed/Assembly-CSharp-firstpass.dll.mdb
new file mode 100644
index 0000000..c055f75
Binary files /dev/null and b/ServerUnity/Library/PlayerDataCache/Data/Managed/Assembly-CSharp-firstpass.dll.mdb differ
diff --git a/ServerUnity/Library/PlayerDataCache/Data/Managed/Assembly-CSharp.dll b/ServerUnity/Library/PlayerDataCache/Data/Managed/Assembly-CSharp.dll
index 2a62c76..e2710b4 100644
Binary files a/ServerUnity/Library/PlayerDataCache/Data/Managed/Assembly-CSharp.dll and b/ServerUnity/Library/PlayerDataCache/Data/Managed/Assembly-CSharp.dll differ
diff --git a/ServerUnity/Library/PlayerDataCache/Data/Managed/Assembly-CSharp.dll.mdb b/ServerUnity/Library/PlayerDataCache/Data/Managed/Assembly-CSharp.dll.mdb
new file mode 100644
index 0000000..9cf0014
Binary files /dev/null and b/ServerUnity/Library/PlayerDataCache/Data/Managed/Assembly-CSharp.dll.mdb differ
diff --git a/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.Analytics.dll.mdb b/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.Analytics.dll.mdb
new file mode 100644
index 0000000..de33b29
Binary files /dev/null and b/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.Analytics.dll.mdb differ
diff --git a/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.Networking.dll.mdb b/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.Networking.dll.mdb
new file mode 100644
index 0000000..cd6181a
Binary files /dev/null and b/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.Networking.dll.mdb differ
diff --git a/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.SpatialTracking.dll.mdb b/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.SpatialTracking.dll.mdb
new file mode 100644
index 0000000..752b825
Binary files /dev/null and b/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.SpatialTracking.dll.mdb differ
diff --git a/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.StandardEvents.dll.mdb b/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.StandardEvents.dll.mdb
new file mode 100644
index 0000000..4c67b64
Binary files /dev/null and b/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.StandardEvents.dll.mdb differ
diff --git a/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.Timeline.dll.mdb b/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.Timeline.dll.mdb
new file mode 100644
index 0000000..67fb278
Binary files /dev/null and b/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.Timeline.dll.mdb differ
diff --git a/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.UI.dll.mdb b/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.UI.dll.mdb
new file mode 100644
index 0000000..999ba3e
Binary files /dev/null and b/ServerUnity/Library/PlayerDataCache/Data/Managed/UnityEngine.UI.dll.mdb differ
diff --git a/ServerUnity/Library/PlayerDataCache/Data/boot.config b/ServerUnity/Library/PlayerDataCache/Data/boot.config
index 1aea26b..06ed21a 100644
--- a/ServerUnity/Library/PlayerDataCache/Data/boot.config
+++ b/ServerUnity/Library/PlayerDataCache/Data/boot.config
@@ -1,3 +1,10 @@
+player-connection-mode=Listen
+player-connection-guid=870278337
+player-connection-debug=1
+player-connection-wait-timeout=-1
+player-connection-ip=172.17.49.241
+player-connection-ip=10.0.0.167
 gfx-enable-native-gfx-jobs=
 wait-for-native-debugger=0
+wait-for-managed-debugger=0
 scripting-runtime-version=latest
diff --git a/ServerUnity/Library/PlayerDataCache/Data/data.unity3d b/ServerUnity/Library/PlayerDataCache/Data/data.unity3d
index ba9dad6..8e5d14f 100644
Binary files a/ServerUnity/Library/PlayerDataCache/Data/data.unity3d and b/ServerUnity/Library/PlayerDataCache/Data/data.unity3d differ
diff --git a/ServerUnity/Library/PlayerDataCache/ScriptLayoutHashes.txt b/ServerUnity/Library/PlayerDataCache/ScriptLayoutHashes.txt
index 9bd0767..7df1041 100644
--- a/ServerUnity/Library/PlayerDataCache/ScriptLayoutHashes.txt
+++ b/ServerUnity/Library/PlayerDataCache/ScriptLayoutHashes.txt
@@ -1,6 +1,6 @@
 WindowsStandalone
 PlayerPath?
-D:/Development/Distance/DistanceServerStandalonePublic/DistanceServer/Build/Windows/DistanceServer/DistanceServer.exe
+D:/DevelopmentUnsynced/DistanceServer/ServerUnity/BuildWindows/BuildWindows.exe
 SceneListBegin?
 Assets/Scenes/Server.unity
 SceneListEnd?
diff --git a/ServerUnity/Library/ScriptAssemblies/Assembly-CSharp.dll b/ServerUnity/Library/ScriptAssemblies/Assembly-CSharp.dll
index 878465c..e2710b4 100644
Binary files a/ServerUnity/Library/ScriptAssemblies/Assembly-CSharp.dll and b/ServerUnity/Library/ScriptAssemblies/Assembly-CSharp.dll differ
diff --git a/ServerUnity/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/ServerUnity/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
index 87c56fa..9cf0014 100644
Binary files a/ServerUnity/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/ServerUnity/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ
diff --git a/ServerUnity/Library/ShaderCache/4/44860130fd6806bb4790790dbcfdfec8.bin b/ServerUnity/Library/ShaderCache/4/44860130fd6806bb4790790dbcfdfec8.bin
new file mode 100644
index 0000000..4022cc0
Binary files /dev/null and b/ServerUnity/Library/ShaderCache/4/44860130fd6806bb4790790dbcfdfec8.bin differ
diff --git a/ServerUnity/Library/ShaderCache/a/a2f54829173909d527919399729eb440.bin b/ServerUnity/Library/ShaderCache/a/a2f54829173909d527919399729eb440.bin
new file mode 100644
index 0000000..cb1d6d7
Binary files /dev/null and b/ServerUnity/Library/ShaderCache/a/a2f54829173909d527919399729eb440.bin differ
diff --git a/ServerUnity/Library/ShaderCache/c/ca9025ec6a6c96a53cc09dac146be381.bin b/ServerUnity/Library/ShaderCache/c/ca9025ec6a6c96a53cc09dac146be381.bin
new file mode 100644
index 0000000..9628ed7
Binary files /dev/null and b/ServerUnity/Library/ShaderCache/c/ca9025ec6a6c96a53cc09dac146be381.bin differ
diff --git a/ServerUnity/Library/assetDatabase3 b/ServerUnity/Library/assetDatabase3
index 4272a43..24fbbfd 100644
Binary files a/ServerUnity/Library/assetDatabase3 and b/ServerUnity/Library/assetDatabase3 differ
diff --git a/ServerUnity/Library/metadata/00/00000000000000001000000020000000 b/ServerUnity/Library/metadata/00/00000000000000001000000020000000
index 7e7c0b5..260af9e 100644
Binary files a/ServerUnity/Library/metadata/00/00000000000000001000000020000000 and b/ServerUnity/Library/metadata/00/00000000000000001000000020000000 differ
diff --git a/ServerUnity/Library/metadata/00/00000000000000001000000020000000.info b/ServerUnity/Library/metadata/00/00000000000000001000000020000000.info
new file mode 100644
index 0000000..5514ac9
Binary files /dev/null and b/ServerUnity/Library/metadata/00/00000000000000001000000020000000.info differ
diff --git a/ServerUnity/Library/metadata/2f/2f0c0e5b919c5034b9f4ce90cd7ea311 b/ServerUnity/Library/metadata/2f/2f0c0e5b919c5034b9f4ce90cd7ea311
index df14206..4580741 100644
Binary files a/ServerUnity/Library/metadata/2f/2f0c0e5b919c5034b9f4ce90cd7ea311 and b/ServerUnity/Library/metadata/2f/2f0c0e5b919c5034b9f4ce90cd7ea311 differ
diff --git a/ServerUnity/Library/metadata/ce/cec04fe290a739b44bcc4f5211b5790e b/ServerUnity/Library/metadata/ce/cec04fe290a739b44bcc4f5211b5790e
index ec40414..0694343 100644
Binary files a/ServerUnity/Library/metadata/ce/cec04fe290a739b44bcc4f5211b5790e and b/ServerUnity/Library/metadata/ce/cec04fe290a739b44bcc4f5211b5790e differ
diff --git a/package.sh b/package.sh
new file mode 100644
index 0000000..62a9be2
--- /dev/null
+++ b/package.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+mkdir -p $(dirname "$0")/Packaged/Server/Plugins
+
+for directory in $(dirname "$0")/ServerPlugins/*/; do
+	basename = $(basename -- $directory)
+	cp $directory/bin/Debug/*.dll $(dirname "$0")/Packaged/Server/Plugins/
+done
+
+cp $(dirname "$0")/ServerBase/bin/Debug/*.dll $(dirname "$0")/Packaged/Server/
+
+cp -r $(dirname "$0")/ServerUnity/BuildLinux/* $(dirname "$0")/Packaged/Server/
\ No newline at end of file