diff --git a/Launcher/Icon.ico b/Launcher/Icon.ico
new file mode 100644
index 000000000..5b40528ea
Binary files /dev/null and b/Launcher/Icon.ico differ
diff --git a/Launcher/Launcher.csproj b/Launcher/Launcher.csproj
index 40d07dd82..0a2113637 100644
--- a/Launcher/Launcher.csproj
+++ b/Launcher/Launcher.csproj
@@ -34,6 +34,9 @@
   <PropertyGroup>
     <StartupObject>Launcher.Program</StartupObject>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Icon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -96,6 +99,9 @@
       <Name>Subsurface</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Icon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Subsurface/Content/Items/Artifacts/artifacts.xml b/Subsurface/Content/Items/Artifacts/artifacts.xml
index 7faf4744e..111daf9f2 100644
--- a/Subsurface/Content/Items/Artifacts/artifacts.xml
+++ b/Subsurface/Content/Items/Artifacts/artifacts.xml
@@ -2,8 +2,7 @@
 <Items>
   <Item
     name="Skyholder Artifact"
-    pickdistance="150"
-    price="100">
+    pickdistance="150">
 
     <Sprite texture="artifact.png" depth="0.8"/>
 
diff --git a/Subsurface/Content/Items/Button/button.xml b/Subsurface/Content/Items/Button/button.xml
index f381f6949..10d77ca8b 100644
--- a/Subsurface/Content/Items/Button/button.xml
+++ b/Subsurface/Content/Items/Button/button.xml
@@ -2,7 +2,8 @@
   name="Button"
   type="Controller"  
   linkable="true"
-  pickdistance="150.0">
+  pickdistance="150.0"
+  price="10">
 
   <Sprite texture ="button.png" depth="0.8"/>
   
diff --git a/Subsurface/Content/Items/Door/doors.xml b/Subsurface/Content/Items/Door/doors.xml
index 92cd50284..9bd4eeb16 100644
--- a/Subsurface/Content/Items/Door/doors.xml
+++ b/Subsurface/Content/Items/Door/doors.xml
@@ -7,7 +7,7 @@
     <Sprite texture ="door.png" sourcerect="0,0,48,208" depth="0.8" origin="0.5,0.5"/>
 
     <Door>
-      <Sprite texture ="door.png" sourcerect="80,0,19,208" depth="0.4" origin="0.5,0.0"/>
+      <Sprite texture ="door.png" sourcerect="80,0,19,208" depth="0.0" origin="0.5,0.0"/>
     </Door>
 
     <AiTarget sightrange="5000.0"/>
@@ -29,7 +29,7 @@
     <Sprite texture ="door.png" sourcerect="0,0,48,208" depth="0.8" origin="0.5,0.5"/>
 
     <Door window="0,-18,10,89">
-      <Sprite texture ="door.png" sourcerect="56,0,19,208" depth="0.4" origin="0.5,0.0"/>
+      <Sprite texture ="door.png" sourcerect="56,0,19,208" depth="0.0" origin="0.5,0.0"/>
     </Door>
 
     <AiTarget sightrange="5000.0"/>
diff --git a/Subsurface/Content/Items/Medical/medical.xml b/Subsurface/Content/Items/Medical/medical.xml
index 72f61bba5..b5910f85d 100644
--- a/Subsurface/Content/Items/Medical/medical.xml
+++ b/Subsurface/Content/Items/Medical/medical.xml
@@ -3,7 +3,8 @@
   <Item
     name="Medical Syringe"
     Tags="smallitem"
-    pickdistance="150">
+    pickdistance="150"
+    price="50">
 
     <Sprite texture ="med.png" sourcerect="0,0,24,5" depth="0.6"/>
 
@@ -17,7 +18,8 @@
   <Item
     name="Bandage"
     Tags="smallitem"
-    pickdistance="150">
+    pickdistance="150"
+    price="20">
 
     <Sprite texture ="med.png" sourcerect="0,14,14,18" depth="0.6"/>
 
diff --git a/Subsurface/Content/Items/Tools/tools.xml b/Subsurface/Content/Items/Tools/tools.xml
index b8adb84d2..1798c418c 100644
--- a/Subsurface/Content/Items/Tools/tools.xml
+++ b/Subsurface/Content/Items/Tools/tools.xml
@@ -3,7 +3,8 @@
   <Item
     name="Welding Tool"
     Tags="smallitem"
-    pickdistance="200">
+    pickdistance="200"
+    price="100">
 
     <Sprite texture ="weldingtool.png"  depth="0.5"/>
 
@@ -45,7 +46,8 @@
   <Item
     name="Plasma Cutter"
     Tags="smallitem"
-    pickdistance="200">
+    pickdistance="200"
+    price="100">
 
     <Sprite texture ="plasmacutter.png"  depth="0.5"/>
 
@@ -77,7 +79,8 @@
   <Item
     name="Welding Fuel Tank"
     Tags="smallitem"
-    pickdistance="150">
+    pickdistance="150"
+    price="50">
 
     <Sprite texture ="fueltank.png" depth="0.5"/>
 
@@ -90,7 +93,8 @@
   <Item
     name="Screwdriver"
     Tags="smallitem"
-    pickdistance="200">
+    pickdistance="200"
+    price="10">
 
     <Sprite texture ="screwdriver.png" depth="0.5"/>
 
@@ -104,7 +108,8 @@
   <Item
     name="Wrench"
     Tags="smallitem"
-    pickdistance="200">
+    pickdistance="200"
+    price="10">
 
     <Sprite texture ="wrench.png" depth="0.5"/>
 
diff --git a/Subsurface/Content/Items/Weapons/explosives.xml b/Subsurface/Content/Items/Weapons/explosives.xml
index 94536c2d5..d9ff27283 100644
--- a/Subsurface/Content/Items/Weapons/explosives.xml
+++ b/Subsurface/Content/Items/Weapons/explosives.xml
@@ -4,7 +4,7 @@
     name="C-4 Block"
     Tags="smallitem,explosive"
     pickdistance="150"
-    price="50">
+    price="100">
 
     <Sprite texture="explosives.png"  depth="0.8" sourcerect="0,0,16,7"/>
 
diff --git a/Subsurface/Content/Items/Weapons/weapons.xml b/Subsurface/Content/Items/Weapons/weapons.xml
index b80dbf6cc..d9db63348 100644
--- a/Subsurface/Content/Items/Weapons/weapons.xml
+++ b/Subsurface/Content/Items/Weapons/weapons.xml
@@ -3,7 +3,8 @@
 <Items>
   <Item
     name="Spear"
-    pickdistance="200">
+    pickdistance="200"
+    price="50">
 
     <Sprite texture ="spear.png" depth="0.55"/>
 
@@ -17,7 +18,8 @@
   
   <Item
     name="Harpoon Gun"
-    pickdistance="200" >
+    pickdistance="200"
+    price="500">
   
     <Sprite texture ="harpoongun.png" depth="0.5"/>
 
@@ -39,7 +41,9 @@
 
   <Item
     name="Stun Grenade"
-    pickdistance="200" >
+    pickdistance="200"
+    price="200"
+    tags="smallitem">
 
     <Sprite texture ="stungrenade.png" depth="0.04"/>
 
diff --git a/Subsurface/Content/Items/wireCorner.png b/Subsurface/Content/Items/wireCorner.png
index 57c55c01d..8e3766a64 100644
Binary files a/Subsurface/Content/Items/wireCorner.png and b/Subsurface/Content/Items/wireCorner.png differ
diff --git a/Subsurface/Content/Items/wireHorizontal.png b/Subsurface/Content/Items/wireHorizontal.png
index 28fec2afd..5480f1c68 100644
Binary files a/Subsurface/Content/Items/wireHorizontal.png and b/Subsurface/Content/Items/wireHorizontal.png differ
diff --git a/Subsurface/Content/Items/wireVertical.png b/Subsurface/Content/Items/wireVertical.png
index 6bbe6d0b4..c707d3db6 100644
Binary files a/Subsurface/Content/Items/wireVertical.png and b/Subsurface/Content/Items/wireVertical.png differ
diff --git a/Subsurface/Content/Quests.xml b/Subsurface/Content/Quests.xml
index dd9dfd2e5..0942687c4 100644
--- a/Subsurface/Content/Quests.xml
+++ b/Subsurface/Content/Quests.xml
@@ -6,7 +6,7 @@
     commonness="10"
     reward="1000"
     radarlabel="Infrasonic signal"
-    failuremessage="fail"
+    failuremessage="Retrieving the artifact failed"
     successmessage="The artifact has been succesfully retrived"
     itemname="Skyholder Artifact">    
   </SalvageQuest>
@@ -17,7 +17,6 @@
     commonness="10"
     reward="1000"
     radarlabel="Moloch"
-    failuremessage="fail"
     successmessage="The Moloch has been killed."
     monsterfile="Content/Characters/Moloch/moloch.xml">
   </MonsterQuest>
@@ -28,7 +27,6 @@
     commonness="10"
     reward="800"
     radarlabel="Tiger Thresher"
-    failuremessage="fail"
     successmessage="The Tiger Thresher has been killed."
     monsterfile="Content/Characters/TigerThresher/tigerthresher.xml">
   </MonsterQuest>
@@ -39,7 +37,6 @@
     commonness="5"
     reward="1000"
     radarlabel="Infrasonic signal"
-    failuremessage="It turns out the signal picked up by [location1] was emitted by a Moloch."
     successmessage="It turns out the signal was emitted by a Moloch. The researchers of [location1] have agreed to pay you the reward nevertheless for killing the Moloch."
     monsterfile="Content/Characters/Moloch/moloch.xml">
   </MonsterQuest>
diff --git a/Subsurface/Content/Sounds/Music/Simplex.ogg b/Subsurface/Content/Sounds/Music/Simplex.ogg
index 3e4b17dca..7130b38a8 100644
Binary files a/Subsurface/Content/Sounds/Music/Simplex.ogg and b/Subsurface/Content/Sounds/Music/Simplex.ogg differ
diff --git a/Subsurface/Content/Sounds/startDrone.ogg b/Subsurface/Content/Sounds/startDrone.ogg
new file mode 100644
index 000000000..21f4fd57d
Binary files /dev/null and b/Subsurface/Content/Sounds/startDrone.ogg differ
diff --git a/Subsurface/Content/UI/uiBackground.png b/Subsurface/Content/UI/uiBackground.png
index 60ca3146d..51e1d8549 100644
Binary files a/Subsurface/Content/UI/uiBackground.png and b/Subsurface/Content/UI/uiBackground.png differ
diff --git a/Subsurface/Icon.ico b/Subsurface/Icon.ico
index 7d9dec187..5b40528ea 100644
Binary files a/Subsurface/Icon.ico and b/Subsurface/Icon.ico differ
diff --git a/Subsurface/Properties/AssemblyInfo.cs b/Subsurface/Properties/AssemblyInfo.cs
index 5a7e7370c..0f41eb25e 100644
--- a/Subsurface/Properties/AssemblyInfo.cs
+++ b/Subsurface/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // 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("0.0.1.3")]
-[assembly: AssemblyFileVersion("0.0.1.3")]
+[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]
diff --git a/Subsurface/Camera.cs b/Subsurface/Source/Camera.cs
similarity index 100%
rename from Subsurface/Camera.cs
rename to Subsurface/Source/Camera.cs
diff --git a/Subsurface/Characters/AI/AIController.cs b/Subsurface/Source/Characters/AI/AIController.cs
similarity index 100%
rename from Subsurface/Characters/AI/AIController.cs
rename to Subsurface/Source/Characters/AI/AIController.cs
diff --git a/Subsurface/Characters/AI/AITarget.cs b/Subsurface/Source/Characters/AI/AITarget.cs
similarity index 100%
rename from Subsurface/Characters/AI/AITarget.cs
rename to Subsurface/Source/Characters/AI/AITarget.cs
diff --git a/Subsurface/Characters/AI/EnemyAIController.cs b/Subsurface/Source/Characters/AI/EnemyAIController.cs
similarity index 100%
rename from Subsurface/Characters/AI/EnemyAIController.cs
rename to Subsurface/Source/Characters/AI/EnemyAIController.cs
diff --git a/Subsurface/Characters/AI/ISteerable.cs b/Subsurface/Source/Characters/AI/ISteerable.cs
similarity index 100%
rename from Subsurface/Characters/AI/ISteerable.cs
rename to Subsurface/Source/Characters/AI/ISteerable.cs
diff --git a/Subsurface/Characters/AI/PathFinder.cs b/Subsurface/Source/Characters/AI/PathFinder.cs
similarity index 100%
rename from Subsurface/Characters/AI/PathFinder.cs
rename to Subsurface/Source/Characters/AI/PathFinder.cs
diff --git a/Subsurface/Characters/AI/SteeringManager.cs b/Subsurface/Source/Characters/AI/SteeringManager.cs
similarity index 100%
rename from Subsurface/Characters/AI/SteeringManager.cs
rename to Subsurface/Source/Characters/AI/SteeringManager.cs
diff --git a/Subsurface/Characters/AI/SteeringPath.cs b/Subsurface/Source/Characters/AI/SteeringPath.cs
similarity index 100%
rename from Subsurface/Characters/AI/SteeringPath.cs
rename to Subsurface/Source/Characters/AI/SteeringPath.cs
diff --git a/Subsurface/Characters/AnimController.cs b/Subsurface/Source/Characters/AnimController.cs
similarity index 100%
rename from Subsurface/Characters/AnimController.cs
rename to Subsurface/Source/Characters/AnimController.cs
diff --git a/Subsurface/Characters/Attack.cs b/Subsurface/Source/Characters/Attack.cs
similarity index 100%
rename from Subsurface/Characters/Attack.cs
rename to Subsurface/Source/Characters/Attack.cs
diff --git a/Subsurface/Characters/Character.cs b/Subsurface/Source/Characters/Character.cs
similarity index 97%
rename from Subsurface/Characters/Character.cs
rename to Subsurface/Source/Characters/Character.cs
index c8c669313..ffd8599f3 100644
--- a/Subsurface/Characters/Character.cs
+++ b/Subsurface/Source/Characters/Character.cs
@@ -1,1183 +1,1183 @@
-using FarseerPhysics;
-using FarseerPhysics.Dynamics;
-using FarseerPhysics.Dynamics.Joints;
-using Lidgren.Network;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Input;
-using Subsurface.Networking;
-using Subsurface.Particles;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Xml.Linq;
-
-namespace Subsurface
-{
-    class Character : Entity, IDamageable, IPropertyObject
-    {
-        public static List<Character> CharacterList = new List<Character>();
-        
-        public static Queue<CharacterInfo> NewCharacterQueue = new Queue<CharacterInfo>();
-
-        public static bool DisableControls;
-
-        //the character that the player is currently controlling
-        private static Character controlled;
-
-        public static Character Controlled
-        {
-            get { return controlled; }
-            set { controlled = value; }
-        }
-
-        public readonly bool IsNetworkPlayer;
-
-        private Inventory inventory;
-
-        public double LastNetworkUpdate;
-
-        public int LargeUpdateTimer;
-
-        public readonly Dictionary<string, ObjectProperty> Properties;
-        public Dictionary<string, ObjectProperty> ObjectProperties
-        {
-            get { return Properties; }
-        }
-
-        protected Key selectKeyHit;
-        protected Key actionKeyHit, actionKeyDown;
-        protected Key secondaryKeyHit, secondaryKeyDown;
-                
-        private Item selectedConstruction;
-        private Item[] selectedItems;
-        
-        public AnimController AnimController;
-        private AIController aiController;
-
-        private Vector2 cursorPosition;
-
-        protected bool needsAir;
-        protected float oxygen;
-        protected float drowningTime;
-
-        protected float health;
-        protected float maxHealth;
-
-        protected Item closestItem;
-
-        protected bool isDead;
-        
-        bool isHumanoid;
-
-        //the name of the species (e.q. human)
-        public readonly string SpeciesName;
-
-        private CharacterInfo info;
-
-        public CharacterInfo Info
-        {
-            get
-            { 
-                return info;
-            }
-            set 
-            {
-                info = value;
-                if (info != null) info.Character = this;
-            }
-        }
-
-        protected float soundTimer;
-        protected float soundInterval;
-
-        private float bleeding;
-        //private float blood;
-                
-        private Sound[] sounds;
-        private float[] soundRange;
-        //which AIstate each sound is for
-        private AIController.AiState[] soundStates;
-        
-        public string Name
-        {
-            get
-            {
-                return SpeciesName;
-            }
-        }
-
-        public float Mass
-        {
-            get { return AnimController.Mass; }
-        }
-
-        public Inventory Inventory
-        {
-            get { return inventory; }
-        }
-
-        public Vector2 CursorPosition
-        {
-            get { return cursorPosition; }
-        }
-
-        public float SoundRange
-        {
-            get { return aiTarget.SoundRange; }
-        }
-
-        public float SightRange
-        {
-            get { return aiTarget.SightRange; }
-        }
-        private float pressureProtection;
-        public float PressureProtection
-        {
-            get { return pressureProtection; }
-            set
-            {
-                pressureProtection = MathHelper.Clamp(value, 0.0f, 100.0f);
-            }
-        }
-
-        public float Oxygen
-        {
-            get { return oxygen; }
-            set 
-            { 
-                oxygen = MathHelper.Clamp(value, 0.0f, 100.0f);
-                if (oxygen == 0.0f) Kill();
-            }
-        }
-
-        public float Health
-        {
-            get 
-            {
-                return health;
-                //float totalHealth = 0.0f;
-                //foreach (Limb l in animController.limbs)
-                //{
-                //    totalHealth += (l.MaxHealth - l.Damage);
-
-                //}
-                //return totalHealth/animController.limbs.Count();
-            }
-            set
-            {
-                health = MathHelper.Clamp(value, 0.0f, maxHealth);
-                if (health==0.0f) Kill();
-            }
-        }
-
-        public float Bleeding
-        {
-            get { return bleeding; }
-            set 
-            {
-                if (float.IsNaN(value) || float.IsInfinity(value)) return;
-                bleeding = Math.Max(value, 0.0f); 
-            }
-        }
-        
-        public Item[] SelectedItems
-        {
-            get { return selectedItems; }
-        }
-        
-        public bool HasSelectedItem(Item item)
-        {
-            return selectedItems.Contains(item);
-        }
-
-        public bool TrySelectItem(Item item)
-        {
-            bool rightHand = ((CharacterInventory)inventory).IsInLimbSlot(item, LimbSlot.RightHand);
-            bool leftHand = ((CharacterInventory)inventory).IsInLimbSlot(item, LimbSlot.LeftHand);
-
-            bool selected = false;
-            if (rightHand && SelectedItems[0] == null)
-            {
-                selectedItems[0] = item;
-                selected = true;
-            }
-            if (leftHand && SelectedItems[1] == null)
-            {
-                selectedItems[1] = item;
-                selected = true;
-            }
-
-            return selected;
-        }
-
-        public bool TrySelectItem(Item item, int index)
-        {
-            if (selectedItems[index] != null) return false;
-
-            selectedItems[index] = item;
-            return true;
-        }
-
-        public void DeselectItem(Item item)
-        {
-            for (int i = 0; i < selectedItems.Length; i++)
-            {
-                if (selectedItems[i] == item) selectedItems[i] = null;
-            }
-        }
-
-        public Item SelectedConstruction
-        {
-            get { return selectedConstruction; }
-            set { selectedConstruction = value; }
-        }
-
-        public Item ClosestItem
-        {
-            get { return closestItem; }
-        }
-
-        public Key SelectKeyHit
-        {
-            get { return selectKeyHit; }
-        }
-
-        public Key ActionKeyHit
-        {
-            get { return actionKeyHit; }
-        }
-
-        public Key ActionKeyDown
-        {
-            get { return actionKeyDown; }
-        }
-
-        public Key SecondaryKeyHit
-        {
-            get { return secondaryKeyHit; }
-        }
-
-        public Key SecondaryKeyDown
-        {
-            get { return secondaryKeyDown; }
-        }
-
-        public bool IsDead
-        {
-            get { return isDead; }
-        }
-
-        public override Vector2 SimPosition
-        {
-            get { return AnimController.limbs[0].SimPosition; }
-        }
-
-        public Vector2 Position
-        {
-            get { return ConvertUnits.ToDisplayUnits(AnimController.limbs[0].SimPosition); }
-        }
-
-        public Character(string file) : this(file, Vector2.Zero, null)
-        {
-        }
-
-        public Character(string file, Vector2 position)
-            : this(file, position, null)
-        {
-        }
-
-        public Character(CharacterInfo characterInfo, WayPoint spawnPoint, bool isNetworkPlayer = false)
-            : this(characterInfo.File, spawnPoint.SimPosition, characterInfo, isNetworkPlayer)
-        {
-
-        }
-
-        public Character(CharacterInfo characterInfo, Vector2 position, bool isNetworkPlayer = false)
-            : this(characterInfo.File, position, characterInfo, isNetworkPlayer)
-        {
-        }
-
-        public Character(string file, Vector2 position, CharacterInfo characterInfo = null, bool isNetworkPlayer = false)
-        {
-            selectKeyHit = new Key(false);
-            actionKeyDown = new Key(true);
-            actionKeyHit = new Key(false);
-            secondaryKeyHit = new Key(false);
-            secondaryKeyDown = new Key(true);
-
-            selectedItems = new Item[2];
-
-            IsNetworkPlayer = isNetworkPlayer;
-
-            oxygen = 100.0f;
-            //blood = 100.0f;
-            aiTarget = new AITarget(this);
-
-            Properties = ObjectProperty.GetProperties(this);
-
-            Info = characterInfo==null ? new CharacterInfo(file) : characterInfo;
-
-            XDocument doc = ToolBox.TryLoadXml(file);
-            if (doc == null) return;
-            
-            SpeciesName = ToolBox.GetAttributeString(doc.Root, "name", "Unknown");
-
-            isHumanoid = ToolBox.GetAttributeBool(doc.Root, "humanoid", false);
-            
-            if (isHumanoid)
-            {
-                AnimController = new HumanoidAnimController(this, doc.Root.Element("ragdoll"));
-                AnimController.TargetDir = Direction.Right;
-                inventory = new CharacterInventory(10, this);
-            }
-            else
-            {
-                AnimController = new FishAnimController(this, doc.Root.Element("ragdoll"));
-                PressureProtection = 100.0f;
-                //FishAnimController fishAnim = (FishAnimController)animController;
-
-                aiController = new EnemyAIController(this, file);
-            }
-
-            foreach (Limb limb in AnimController.limbs)
-            {
-                limb.body.SetTransform(position+limb.SimPosition, 0.0f);
-                //limb.prevPosition = ConvertUnits.ToDisplayUnits(position);
-            }
-
-            maxHealth = ToolBox.GetAttributeFloat(doc.Root, "health", 100.0f);
-            health = maxHealth;
-
-            needsAir = ToolBox.GetAttributeBool(doc.Root, "needsair", false);
-            drowningTime = ToolBox.GetAttributeFloat(doc.Root, "drowningtime", 10.0f);
-
-            soundInterval = ToolBox.GetAttributeFloat(doc.Root, "soundinterval", 10.0f);
-
-            var soundElements = doc.Root.Elements("sound").ToList();
-            if (soundElements.Any())
-            {
-                sounds = new Sound[soundElements.Count()];
-                soundStates = new AIController.AiState[soundElements.Count()];
-                soundRange = new float[soundElements.Count()];
-                int i = 0;
-                foreach (XElement soundElement in soundElements)
-                {
-                    sounds[i] = Sound.Load(soundElement.Attribute("file").Value);
-                    soundRange[i] = ToolBox.GetAttributeFloat(soundElement, "range", 1000.0f);
-                    if (soundElement.Attribute("state") == null)
-                    {
-                        soundStates[i] = AIController.AiState.None;
-                    }
-                    else
-                    {
-                        soundStates[i] = (AIController.AiState)Enum.Parse(
-                            typeof(AIController.AiState), soundElement.Attribute("state").Value, true);
-                    }
-                    i++;
-                }
-            }
-
-            if (Info.PickedItemIDs.Any())
-            {
-                foreach (int id in Info.PickedItemIDs)
-                {
-                    Item item = FindEntityByID(id) as Item;
-                    if (item == null) continue;
-
-                    item.Pick(this);
-                }
-            }
-
-            AnimController.FindHull();
-
-            CharacterList.Add(this);
-        }
-
-        private static string humanConfigFile;
-        public static string HumanConfigFile
-        {
-            get 
-            {
-                if (string.IsNullOrEmpty(humanConfigFile))
-                {
-                    var characterFiles = Game1.SelectedPackage.GetFilesOfType(ContentType.Character);
-
-                    humanConfigFile = characterFiles.Find(c => c.EndsWith("human.xml"));
-                    if (humanConfigFile == null)
-                    {
-                        DebugConsole.ThrowError("Couldn't find a config file for humans from the selected content package!");
-                        DebugConsole.ThrowError("(The config file must end with ''human.xml'')");
-                        return "";
-                    }
-                }
-                return humanConfigFile; 
-            }
-        }
-
-        public void GiveJobItems(WayPoint spawnPoint)
-        {
-            if (Info == null || Info.Job == null) return;
-            
-            foreach (string itemName in Info.Job.SpawnItemNames)
-            {
-                ItemPrefab itemPrefab = ItemPrefab.list.Find(ip => ip.Name == itemName) as ItemPrefab;
-                if (itemPrefab == null)
-                {
-                    DebugConsole.ThrowError("Tried to spawn ''" + Name + "'' with the item ''" + itemName + "''. Matching item prefab not found.");
-                    continue;
-                }
-
-                Item item = new Item(itemPrefab, Position);
-                inventory.TryPutItem(item, item.AllowedSlots, false);
-                
-                if (item.Prefab.Name == "ID Card" && spawnPoint!=null)
-                {
-                    foreach (string s in spawnPoint.IdCardTags)
-                    {
-                        
-                        item.AddTag(s);
-                    }                    
-                }
-            }            
-        }
-
-        public int GetSkillLevel(string skillName)
-        {
-            return Info.Job.GetSkillLevel(skillName);
-        }
-
-        public void Control(float deltaTime, Camera cam, bool forcePick = false)
-        {
-            if (isDead) return;
-
-            //find the closest item if selectkey has been hit, or if the character is being
-            //controlled by the player (in order to highlight it)
-            //closestItem = null;
-            if (controlled==this)
-            {
-                Vector2 mouseSimPos = ConvertUnits.ToSimUnits(cam.ScreenToWorld(PlayerInput.MousePosition));
-                closestItem = FindClosestItem(mouseSimPos);
-
-                if (closestItem != null)
-                {
-                    closestItem.IsHighlighted = true;
-                    if (selectKeyHit.State && closestItem.Pick(this, forcePick))
-                    {
-                        new NetworkEvent(NetworkEventType.PickItem, ID, true, closestItem.ID);
-                    }
-                }
-            }
-
-            for (int i = 0; i < selectedItems.Length; i++ )
-            {
-                if (selectedItems[i] == null) continue;
-                if (i == 1 && selectedItems[0] == selectedItems[1]) continue;
-                
-                if (actionKeyDown.State) selectedItems[i].Use(deltaTime, this);
-                if (secondaryKeyDown.State && selectedItems[i] != null) selectedItems[i].SecondaryUse(deltaTime, this);
-                
-            }
-
-            if (selectedConstruction != null)
-            {
-                if (actionKeyDown.State) selectedConstruction.Use(deltaTime, this);
-                if (secondaryKeyDown.State) selectedConstruction.SecondaryUse(deltaTime, this);
-            }
-
-            if (IsNetworkPlayer)
-            {
-                selectKeyHit.Reset();
-                actionKeyHit.Reset();
-                actionKeyDown.Reset();
-                secondaryKeyHit.Reset();
-                secondaryKeyDown.Reset();
-            }
-        }
-
-        private Item FindClosestItem(Vector2 mouseSimPos)
-        {
-            Limb torso = AnimController.GetLimb(LimbType.Torso);
-            Vector2 pos = (torso.body.TargetPosition != Vector2.Zero) ? torso.body.TargetPosition : torso.SimPosition;
-
-            return Item.FindPickable(pos, selectedConstruction == null ? mouseSimPos : selectedConstruction.SimPosition, null, selectedItems);
-        }
-
-        /// <summary>
-        /// Control the character according to player input
-        /// </summary>
-        public void ControlLocalPlayer(Camera cam, bool moveCam = true)
-        {
-            //if (isDead)
-            //{
-
-            //    return;
-            //}
-
-            Limb head = AnimController.GetLimb(LimbType.Head);
-
-            Lights.LightManager.ViewPos = ConvertUnits.ToDisplayUnits(head.SimPosition);
-
-            Vector2 targetMovement = Vector2.Zero;
-
-            if (!DisableControls)
-            {
-                if (PlayerInput.KeyDown(Keys.W)) targetMovement.Y += 1.0f;
-                if (PlayerInput.KeyDown(Keys.S)) targetMovement.Y -= 1.0f;
-                if (PlayerInput.KeyDown(Keys.A)) targetMovement.X -= 1.0f;
-                if (PlayerInput.KeyDown(Keys.D)) targetMovement.X += 1.0f;
-
-                //the vertical component is only used for falling through platforms and climbing ladders when not in water,
-                //so the movement can't be normalized or the character would walk slower when pressing down/up
-                if (AnimController.InWater)
-                {
-                    float length = targetMovement.Length();
-                    if (length > 0.0f) targetMovement = targetMovement / length;
-                }
-
-                if (Keyboard.GetState().IsKeyDown(Keys.LeftShift) && Math.Sign(targetMovement.X) == Math.Sign(AnimController.Dir))
-                    targetMovement *= 3.0f;
-
-                selectKeyHit.SetState(PlayerInput.KeyHit(Keys.E));
-                actionKeyHit.SetState(PlayerInput.LeftButtonClicked());
-                actionKeyDown.SetState(PlayerInput.GetMouseState.LeftButton == ButtonState.Pressed);
-                secondaryKeyHit.SetState(PlayerInput.RightButtonClicked());
-                secondaryKeyDown.SetState(PlayerInput.GetMouseState.RightButton == ButtonState.Pressed);
-            }
-            else
-            {
-                selectKeyHit.SetState(false);
-                actionKeyHit.SetState(false);
-                actionKeyDown.SetState(false);
-                secondaryKeyHit.SetState(false);
-                secondaryKeyDown.SetState(false);
-            }
-
-            AnimController.TargetMovement = targetMovement;
-            AnimController.IsStanding = true;
-
-            if (moveCam)
-            {
-                cam.TargetPos = ConvertUnits.ToDisplayUnits(AnimController.limbs[0].SimPosition);
-                cam.OffsetAmount = MathHelper.Lerp(cam.OffsetAmount, 250.0f, 0.05f);
-            }
-            
-            cursorPosition = cam.ScreenToWorld(PlayerInput.MousePosition);            
-            Vector2 mouseSimPos = ConvertUnits.ToSimUnits(cursorPosition);
-            if (Vector2.Distance(AnimController.limbs[0].SimPosition, mouseSimPos)>1.0f)
-            {
-                Body body = Submarine.PickBody(AnimController.limbs[0].SimPosition, mouseSimPos);
-                Structure structure = null;
-                if (body != null) structure = body.UserData as Structure;
-                if (structure != null)
-                {
-                    if (!structure.CastShadow && moveCam)
-                    {
-                        cam.OffsetAmount = MathHelper.Lerp(cam.OffsetAmount, 500.0f, 0.05f);
-                    }
-                }
-            }
-
-
-            if (AnimController.onGround &&
-                !AnimController.InWater &&
-                AnimController.Anim != AnimController.Animation.UsingConstruction)
-            {                
-                if (mouseSimPos.X < head.SimPosition.X-1.0f)
-                {
-                    AnimController.TargetDir = Direction.Left;
-                }
-                else if (mouseSimPos.X > head.SimPosition.X + 1.0f)
-                {
-                    AnimController.TargetDir = Direction.Right;
-                }
-            }
-
-            DisableControls = false;
-        }
-        
-
-        public static void UpdateAnimAll(float deltaTime)
-        {
-            foreach (Character c in CharacterList)
-            {
-                if (c.isDead) continue;
-                c.AnimController.UpdateAnim(deltaTime);
-            }
-        }
-        
-        public static void UpdateAll(Camera cam, float deltaTime)
-        {
-            if (NewCharacterQueue.Count>0)
-            {
-                new Character(NewCharacterQueue.Dequeue(), Vector2.Zero);
-            }
-
-            foreach (Character c in CharacterList)
-            {
-                c.Update(cam, deltaTime);
-            }
-        }
-
-        public void Update(Camera cam, float deltaTime)
-        {
-            if (isDead)
-            {
-                if (controlled == this)
-                {
-                    cam.Zoom = MathHelper.Lerp(cam.Zoom, 1.5f, 0.1f);
-                    cam.TargetPos = ConvertUnits.ToDisplayUnits(AnimController.limbs[0].SimPosition);
-                    cam.OffsetAmount = 0.0f;
-                }
-                return;
-            }
-
-            if (PressureProtection==0.0f && 
-                (AnimController.CurrentHull == null || AnimController.CurrentHull.LethalPressure >= 100.0f))
-            {
-                Implode();
-                return;
-            }
-
-            if (controlled == this) ControlLocalPlayer(cam);
-
-            Control(deltaTime, cam);
-
-            UpdateSightRange();
-            aiTarget.SoundRange = 0.0f;
-
-            if (needsAir)
-            {
-                if (AnimController.HeadInWater)
-                {
-                    Oxygen -= deltaTime*100.0f / drowningTime;
-                }
-                else if (AnimController.CurrentHull != null)
-                {
-                    float hullOxygen = AnimController.CurrentHull.OxygenPercentage;
-                    hullOxygen -= 30.0f;
-
-                    Oxygen += deltaTime * 100.0f * (hullOxygen / 500.0f);
-
-                    AnimController.CurrentHull.Oxygen -= Hull.OxygenConsumptionSpeed * deltaTime;
-                }
-                PressureProtection -= deltaTime*100.0f;
-            }
-
-            if (soundTimer > 0)
-            {
-                soundTimer -= deltaTime;
-            }
-            else
-            {
-                PlaySound((aiController == null) ? AIController.AiState.None : aiController.State);
-                soundTimer = soundInterval;
-            }
-
-            //foreach (Limb limb in animController.limbs)
-            //{
-                Health = health - bleeding * deltaTime;
-            //}
-
-            if (aiController != null) aiController.Update(deltaTime);
-        }
-
-        private void UpdateSightRange()
-        {
-            aiTarget.SightRange = 0.0f;
-
-            //distance is approximated based on the mass of the character 
-            //(which corresponds to size because all the characters have the same limb density)
-            foreach (Limb limb in AnimController.limbs)
-            {
-                aiTarget.SightRange += limb.Mass * 1000.0f;
-            }
-            //the faster the character is moving, the easier it is to see it
-            Limb torso = AnimController.GetLimb(LimbType.Torso);
-            if (torso !=null)
-            {
-                aiTarget.SightRange += torso.LinearVelocity.Length() * 500.0f;
-            }
-        }
-        
-        public void Draw(SpriteBatch spriteBatch)
-        {
-            AnimController.Draw(spriteBatch);
-            
-            //GUI.DrawLine(spriteBatch, ConvertUnits.ToDisplayUnits(animController.limbs[0].SimPosition.X, animController.limbs[0].SimPosition.Y),
-            //    ConvertUnits.ToDisplayUnits(animController.limbs[0].SimPosition.X, animController.limbs[0].SimPosition.Y) +
-            //    ConvertUnits.ToDisplayUnits(animController.targetMovement.X, animController.targetMovement.Y), Color.Green);
-        }
-
-        public void DrawFront(SpriteBatch spriteBatch)
-        {
-            if (IsNetworkPlayer)
-            {
-                Vector2 namePos = new Vector2(Position.X, -Position.Y - 80.0f) - GUI.Font.MeasureString(Info.Name) * 0.5f;
-                spriteBatch.DrawString(GUI.Font, Info.Name, namePos - new Vector2(1.0f, 1.0f), Color.Black);
-                spriteBatch.DrawString(GUI.Font, Info.Name, namePos, Color.White);
-
-                if (Game1.DebugDraw)
-                {
-                    spriteBatch.DrawString(GUI.Font, ID.ToString(), namePos - new Vector2(0.0f, 20.0f), Color.White);
-                }
-            }
-
-            Vector2 pos = ConvertUnits.ToDisplayUnits(AnimController.limbs[0].SimPosition);
-            pos.Y = -pos.Y;
-            
-            if (this == Character.controlled) return;
-
-            Vector2 healthBarPos = new Vector2(Position.X - 50, -Position.Y - 50.0f);
-            GUI.DrawRectangle(spriteBatch, new Rectangle((int)healthBarPos.X - 2, (int)healthBarPos.Y - 2, 100 + 4, 15 + 4), Color.Black, false);
-            GUI.DrawRectangle(spriteBatch, new Rectangle((int)healthBarPos.X, (int)healthBarPos.Y, (int)(100.0f * (health / maxHealth)), 15), Color.Red, true);
-
-
-            //GUI.DrawLine(spriteBatch, ConvertUnits.ToDisplayUnits(animController.limbs[0].SimPosition.X, animController.limbs[0].SimPosition.Y),
-            //    ConvertUnits.ToDisplayUnits(animController.limbs[0].SimPosition.X, animController.limbs[0].SimPosition.Y) +
-            //    ConvertUnits.ToDisplayUnits(animController.targetMovement.X, animController.targetMovement.Y), Color.Green);
-        }
-
-
-        private static GUIProgressBar drowningBar, healthBar;
-        public void DrawHud(SpriteBatch spriteBatch, Camera cam)
-        {
-            if (drowningBar==null)
-            {
-                int width = 100, height = 20;
-                drowningBar = new GUIProgressBar(new Rectangle(20, Game1.GraphicsHeight/2, width, height), Color.Blue, 1.0f);
-
-                healthBar = new GUIProgressBar(new Rectangle(20, Game1.GraphicsHeight / 2 + 30, width, height), Color.Red, 1.0f);
-            }
-
-            drowningBar.BarSize = Controlled.Oxygen / 100.0f;
-            if (drowningBar.BarSize < 0.95f) drowningBar.Draw(spriteBatch);
-
-            healthBar.BarSize = health / maxHealth;
-            if (healthBar.BarSize < 1.0f) healthBar.Draw(spriteBatch);
-
-            if (Controlled.Inventory != null) Controlled.Inventory.Draw(spriteBatch);
-
-            if (closestItem != null && selectedConstruction==null)
-            {
-                Color color = Color.Orange;
-
-                Vector2 startPos = Position + (closestItem.Position - Position) * 0.7f;
-                startPos = cam.WorldToScreen(startPos);
-
-                Vector2 textPos = startPos;
-
-                float stringWidth = GUI.Font.MeasureString(closestItem.Prefab.Name).X;
-                textPos -= new Vector2(stringWidth / 2, 20);
-                spriteBatch.DrawString(GUI.Font, closestItem.Prefab.Name, textPos, Color.Black);
-                spriteBatch.DrawString(GUI.Font, closestItem.Prefab.Name, textPos + new Vector2(1, -1), Color.Orange);
-                
-                textPos.Y += 50.0f;
-                foreach (ColoredText coloredText in closestItem.GetHUDTexts(Controlled))
-                {
-                    textPos.X = startPos.X - GUI.Font.MeasureString(coloredText.text).X / 2;
-
-                    spriteBatch.DrawString(GUI.Font, coloredText.text, textPos, Color.Black);
-                    spriteBatch.DrawString(GUI.Font, coloredText.text, textPos + new Vector2(1, -1), coloredText.color);
-
-                    textPos.Y += 25;
-                }                
-            }
-            
-        }
-
-        public void PlaySound(AIController.AiState state)
-        {
-            if (sounds == null || !sounds.Any()) return;
-            var matchingSoundStates = soundStates.Where(x => x == state).ToList();
-
-            int selectedSound = Rand.Int(matchingSoundStates.Count());
-
-            int n = 0;
-            for (int i = 0; i < sounds.Count(); i++)
-            {
-                if (soundStates[i] != state) continue;
-                if (n == selectedSound)
-                {
-                    sounds[i].Play(1.0f, 2000.0f,
-                            AnimController.limbs[0].body.FarseerBody);
-                    Debug.WriteLine("playing: " + sounds[i]);
-                    return;
-                }
-                n++;
-            }
-        }
-
-        public AttackResult AddDamage(Vector2 position, DamageType damageType, float amount, float bleedingAmount, float stun, bool playSound = false)
-        {
-            AnimController.StunTimer = Math.Max(AnimController.StunTimer, stun);
-
-            Limb closestLimb = null;
-            float closestDistance = 0.0f;
-            foreach (Limb limb in AnimController.limbs)
-            {
-                float distance = Vector2.Distance(position, limb.SimPosition);
-                if (closestLimb == null || distance < closestDistance)
-                {
-                    closestLimb = limb;
-                    closestDistance = distance;
-                }
-            }
-
-            Vector2 pull = position - closestLimb.SimPosition;
-            if (pull != Vector2.Zero) pull = Vector2.Normalize(pull);
-            closestLimb.body.ApplyForce(pull*Math.Min(amount*100.0f, 100.0f));
-
-
-            AttackResult attackResult = closestLimb.AddDamage(position, damageType, amount, bleedingAmount, playSound);
-            health -= attackResult.Damage;
-            bleeding += attackResult.Bleeding;
-
-            return attackResult;
-
-        }
-
-        public void Stun()
-        {
-            //for (int i = 0; i < selectedItems.Length; i++ )
-            //{
-            //    if (selectedItems[i] == null) continue;
-            //    selectedItems[i].Drop();
-            //    selectedItems[i] = null;
-            //}
-                
-            selectedConstruction = null;
-        }
-
-        private void Implode()
-        {
-            Limb torso= AnimController.GetLimb(LimbType.Torso);
-            if (torso == null) torso = AnimController.GetLimb(LimbType.Head);
-
-            Vector2 centerOfMass = Vector2.Zero;
-            foreach (Limb limb in AnimController.limbs)
-            {
-                centerOfMass += limb.Mass * limb.SimPosition;
-            }
-
-            centerOfMass /= AnimController.Mass;
-
-            health = 0.0f;
-
-            foreach (Limb limb in AnimController.limbs)
-            {
-                Vector2 diff = centerOfMass - limb.SimPosition;
-                if (diff == Vector2.Zero) continue;
-                limb.body.ApplyLinearImpulse(diff * 10.0f);
-               // limb.Damage = 100.0f;
-            }
-
-            AmbientSoundManager.PlayDamageSound(DamageSoundType.Implode, 50.0f, torso.body.FarseerBody);
-            
-            for (int i = 0; i < 10; i++)
-            {
-                Particle p = Game1.ParticleManager.CreateParticle("waterblood",
-                    torso.SimPosition + new Vector2(Rand.Range(-0.5f, 0.5f), Rand.Range(-0.5f, 0.5f)),
-                    Vector2.Zero);
-                if (p!=null) p.Size *= 2.0f;
-
-                Game1.ParticleManager.CreateParticle("bubbles",
-                    torso.SimPosition,
-                    new Vector2(Rand.Range(-0.5f, 0.5f), Rand.Range(-1.0f,0.5f)));
-            }
-
-            foreach (var joint in AnimController.limbJoints)
-            {
-                joint.LimitEnabled = false;
-            }
-            Kill(true);
-        }
-
-        public void Kill(bool networkMessage = false)
-        {
-            if (isDead) return;
-
-            //if the game is run by a client, characters are only killed when the server says so
-            if (Game1.Client != null)
-            {
-                if (networkMessage)
-                {
-                    new NetworkEvent(NetworkEventType.KillCharacter, ID, true);
-                }
-                else
-                {
-                    return;
-                }
-            }
-
-            isDead = true;
-            AnimController.movement = Vector2.Zero;
-            AnimController.TargetMovement = Vector2.Zero;
-
-            for (int i = 0; i < selectedItems.Length; i++ )
-            {
-                if (selectedItems[i] != null) selectedItems[i].Drop(this);            
-            }
-
-                
-            aiTarget.Remove();
-            aiTarget = null;
-
-            foreach (Limb limb in AnimController.limbs)
-            {
-                if (limb.pullJoint == null) continue;
-                limb.pullJoint.Enabled = false;
-            }
-
-            foreach (RevoluteJoint joint in AnimController.limbJoints)
-            {
-                joint.MotorEnabled = false;
-                joint.MaxMotorTorque = 0.0f;
-            }
-
-            if (Game1.Server != null)
-            {
-                new NetworkEvent(NetworkEventType.KillCharacter, ID, false);
-            }
-
-            if (Game1.GameSession != null)
-            {
-                Game1.GameSession.KillCharacter(this);
-            }
-        }
-
-        public override void FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data)
-        {
-            if (type == NetworkEventType.PickItem)
-            {
-                message.Write((int)data);
-                Debug.WriteLine("pickitem");
-                return;
-            }
-            else if (type == NetworkEventType.KillCharacter)
-            {
-                return;
-            }
-
-
-            //if (type == Networking.NetworkEventType.KeyHit)
-            //{
-            //    message.Write(selectKeyHit.Dequeue);
-                message.Write(actionKeyDown.Dequeue);
-                message.Write(secondaryKeyDown.Dequeue);
-            //}
-
-            message.Write(NetTime.Now);
-
-            // Write byte = move direction
-            message.Write(AnimController.TargetMovement.X);
-            message.Write(AnimController.TargetMovement.Y);
-
-            message.Write(AnimController.TargetDir==Direction.Right);
-
-            message.Write(cursorPosition.X);
-            message.Write(cursorPosition.Y);
-            
-            message.Write(LargeUpdateTimer <= 0);
-
-            if (LargeUpdateTimer<=0)
-            {
-                int i = 0;
-                foreach (Limb limb in AnimController.limbs)
-                {
-                    message.Write(limb.body.Position.X);
-                    message.Write(limb.body.Position.Y);
-
-                    message.Write(limb.body.LinearVelocity.X);
-                    message.Write(limb.body.LinearVelocity.Y);
-
-                    message.Write(limb.body.Rotation);
-                    message.Write(limb.body.AngularVelocity);
-                    i++;
-                }
-
-                message.Write(AnimController.StunTimer);
-                message.Write((byte)health);
-
-                LargeUpdateTimer = 5;
-            }
-            else
-            {
-                Limb torso = AnimController.GetLimb(LimbType.Torso);
-                message.Write(torso.body.Position.X);
-                message.Write(torso.body.Position.Y);
-
-                LargeUpdateTimer = Math.Max(0, LargeUpdateTimer-1);
-            }
-
-
-
-            if (aiController != null) aiController.FillNetworkData(message);
-            
-        }
-
-        public override void ReadNetworkData(NetworkEventType type, NetIncomingMessage message)
-        {
-            if (type == NetworkEventType.PickItem)
-            {
-                int itemId = -1;
-
-                try
-                {
-                    itemId = message.ReadInt32();
-                }
-                catch
-                {
-                    return;
-                }
-
-                Item item = FindEntityByID(itemId) as Item;
-                if (item != null)
-                {
-                    Debug.WriteLine("pickitem "+itemId );
-                    item.Pick(this);
-                }
-
-                return;
-            } 
-            else if (type == NetworkEventType.KillCharacter)
-            {
-                Kill(true);
-                if (Game1.Client != null && controlled == this)
-                {
-                    Game1.Client.AddChatMessage("YOU HAVE DIED. Your chat messages will only be visible to other dead players.", ChatMessageType.Dead);
-                    Game1.LightManager.LosEnabled = false;
-                }
-                return;
-            }
-
-            bool actionKeyState     = false;
-            bool secondaryKeyState  = false;
-            double sendingTime      = 0.0f;
-            Vector2 targetMovement  = Vector2.Zero;
-            bool targetDir          = false;
-            Vector2 cursorPos       = Vector2.Zero;
-
-            try
-            {
-                actionKeyState      = message.ReadBoolean();
-                secondaryKeyState   = message.ReadBoolean();
-            
-                sendingTime         = message.ReadDouble();
-
-                targetMovement      = new Vector2 (message.ReadFloat(), message.ReadFloat());
-                targetDir           = message.ReadBoolean();
-
-                cursorPos           = new Vector2(message.ReadFloat(), message.ReadFloat());
-            }
-
-            catch
-            {
-                return;
-            }
-
-            AnimController.IsStanding = true;
-
-            actionKeyDown.State = actionKeyState;
-            secondaryKeyDown.State = secondaryKeyState;
-
-            if (sendingTime <= LastNetworkUpdate) return;
-            
-            cursorPosition = cursorPos;
-
-            AnimController.TargetMovement= targetMovement;
-            AnimController.TargetDir = (targetDir) ? Direction.Right : Direction.Left;
-                
-            if (message.ReadBoolean())
-            {
-                foreach (Limb limb in AnimController.limbs)
-                {
-                    Vector2 pos = Vector2.Zero, vel = Vector2.Zero;
-                    float rotation = 0.0f, angularVel = 0.0f;
-
-                    try
-                    {
-                        pos.X = message.ReadFloat();
-                        pos.Y = message.ReadFloat();
-
-                        vel.X = message.ReadFloat();
-                        vel.Y = message.ReadFloat();
-
-                        rotation = message.ReadFloat();
-                        angularVel = message.ReadFloat();
-                    }
-                    catch
-                    {
-                        return;
-                    }
-
-                    if (limb.body != null)
-                    {
-                        limb.body.TargetVelocity = vel;
-                        limb.body.TargetPosition = pos;// +vel * (float)(deltaTime / 60.0);
-                        limb.body.TargetRotation = rotation;// +angularVel * (float)(deltaTime / 60.0);
-                        limb.body.TargetAngularVelocity = angularVel;
-                    }
-
-                }
-
-                float newStunTimer = 0.0f, newHealth = 0.0f;
-
-                try
-                {
-                    newStunTimer = message.ReadFloat();
-                    newHealth = message.ReadByte();
-                }
-                catch { return; }
-
-                AnimController.StunTimer = newStunTimer;
-                Health = newHealth;
-
-                LargeUpdateTimer = 1;
-            }
-            else
-            {
-                Vector2 pos = Vector2.Zero;
-                try
-                {
-                    pos.X = message.ReadFloat();
-                    pos.Y = message.ReadFloat();
-                }
-
-                catch { return; }
-
-
-                Limb torso = AnimController.GetLimb(LimbType.Torso);
-                torso.body.TargetPosition = pos;
-
-                LargeUpdateTimer = 0;
-            }
-
-            if (aiController != null) aiController.ReadNetworkData(message);
-
-            LastNetworkUpdate = sendingTime;
-            
-        }
-
-        public override void Remove()
-        {
-            base.Remove();
-
-            CharacterList.Remove(this);
-
-            if (controlled == this) controlled = null;
-
-            if (Game1.Client!=null && Game1.Client.Character == this) Game1.Client.Character = null;
-
-            if (inventory != null) inventory.Remove();
-
-            if (aiTarget != null)
-                aiTarget.Remove();
-
-            if (AnimController!=null)
-                AnimController.Remove();
-        }
-
-    }
-}
+using FarseerPhysics;
+using FarseerPhysics.Dynamics;
+using FarseerPhysics.Dynamics.Joints;
+using Lidgren.Network;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Input;
+using Subsurface.Networking;
+using Subsurface.Particles;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Xml.Linq;
+
+namespace Subsurface
+{
+    class Character : Entity, IDamageable, IPropertyObject
+    {
+        public static List<Character> CharacterList = new List<Character>();
+        
+        public static Queue<CharacterInfo> NewCharacterQueue = new Queue<CharacterInfo>();
+
+        public static bool DisableControls;
+
+        //the character that the player is currently controlling
+        private static Character controlled;
+
+        public static Character Controlled
+        {
+            get { return controlled; }
+            set { controlled = value; }
+        }
+
+        public readonly bool IsNetworkPlayer;
+
+        private Inventory inventory;
+
+        public double LastNetworkUpdate;
+
+        public int LargeUpdateTimer;
+
+        public readonly Dictionary<string, ObjectProperty> Properties;
+        public Dictionary<string, ObjectProperty> ObjectProperties
+        {
+            get { return Properties; }
+        }
+
+        protected Key selectKeyHit;
+        protected Key actionKeyHit, actionKeyDown;
+        protected Key secondaryKeyHit, secondaryKeyDown;
+                
+        private Item selectedConstruction;
+        private Item[] selectedItems;
+        
+        public AnimController AnimController;
+        private AIController aiController;
+
+        private Vector2 cursorPosition;
+
+        protected bool needsAir;
+        protected float oxygen;
+        protected float drowningTime;
+
+        protected float health;
+        protected float maxHealth;
+
+        protected Item closestItem;
+
+        protected bool isDead;
+        
+        bool isHumanoid;
+
+        //the name of the species (e.q. human)
+        public readonly string SpeciesName;
+
+        private CharacterInfo info;
+
+        public CharacterInfo Info
+        {
+            get
+            { 
+                return info;
+            }
+            set 
+            {
+                info = value;
+                if (info != null) info.Character = this;
+            }
+        }
+
+        protected float soundTimer;
+        protected float soundInterval;
+
+        private float bleeding;
+        //private float blood;
+                
+        private Sound[] sounds;
+        private float[] soundRange;
+        //which AIstate each sound is for
+        private AIController.AiState[] soundStates;
+        
+        public string Name
+        {
+            get
+            {
+                return SpeciesName;
+            }
+        }
+
+        public float Mass
+        {
+            get { return AnimController.Mass; }
+        }
+
+        public Inventory Inventory
+        {
+            get { return inventory; }
+        }
+
+        public Vector2 CursorPosition
+        {
+            get { return cursorPosition; }
+        }
+
+        public float SoundRange
+        {
+            get { return aiTarget.SoundRange; }
+        }
+
+        public float SightRange
+        {
+            get { return aiTarget.SightRange; }
+        }
+        private float pressureProtection;
+        public float PressureProtection
+        {
+            get { return pressureProtection; }
+            set
+            {
+                pressureProtection = MathHelper.Clamp(value, 0.0f, 100.0f);
+            }
+        }
+
+        public float Oxygen
+        {
+            get { return oxygen; }
+            set 
+            { 
+                oxygen = MathHelper.Clamp(value, 0.0f, 100.0f);
+                if (oxygen == 0.0f) Kill();
+            }
+        }
+
+        public float Health
+        {
+            get 
+            {
+                return health;
+                //float totalHealth = 0.0f;
+                //foreach (Limb l in animController.limbs)
+                //{
+                //    totalHealth += (l.MaxHealth - l.Damage);
+
+                //}
+                //return totalHealth/animController.limbs.Count();
+            }
+            set
+            {
+                health = MathHelper.Clamp(value, 0.0f, maxHealth);
+                if (health==0.0f) Kill();
+            }
+        }
+
+        public float Bleeding
+        {
+            get { return bleeding; }
+            set 
+            {
+                if (float.IsNaN(value) || float.IsInfinity(value)) return;
+                bleeding = Math.Max(value, 0.0f); 
+            }
+        }
+        
+        public Item[] SelectedItems
+        {
+            get { return selectedItems; }
+        }
+        
+        public bool HasSelectedItem(Item item)
+        {
+            return selectedItems.Contains(item);
+        }
+
+        public bool TrySelectItem(Item item)
+        {
+            bool rightHand = ((CharacterInventory)inventory).IsInLimbSlot(item, LimbSlot.RightHand);
+            bool leftHand = ((CharacterInventory)inventory).IsInLimbSlot(item, LimbSlot.LeftHand);
+
+            bool selected = false;
+            if (rightHand && SelectedItems[0] == null)
+            {
+                selectedItems[0] = item;
+                selected = true;
+            }
+            if (leftHand && SelectedItems[1] == null)
+            {
+                selectedItems[1] = item;
+                selected = true;
+            }
+
+            return selected;
+        }
+
+        public bool TrySelectItem(Item item, int index)
+        {
+            if (selectedItems[index] != null) return false;
+
+            selectedItems[index] = item;
+            return true;
+        }
+
+        public void DeselectItem(Item item)
+        {
+            for (int i = 0; i < selectedItems.Length; i++)
+            {
+                if (selectedItems[i] == item) selectedItems[i] = null;
+            }
+        }
+
+        public Item SelectedConstruction
+        {
+            get { return selectedConstruction; }
+            set { selectedConstruction = value; }
+        }
+
+        public Item ClosestItem
+        {
+            get { return closestItem; }
+        }
+
+        public Key SelectKeyHit
+        {
+            get { return selectKeyHit; }
+        }
+
+        public Key ActionKeyHit
+        {
+            get { return actionKeyHit; }
+        }
+
+        public Key ActionKeyDown
+        {
+            get { return actionKeyDown; }
+        }
+
+        public Key SecondaryKeyHit
+        {
+            get { return secondaryKeyHit; }
+        }
+
+        public Key SecondaryKeyDown
+        {
+            get { return secondaryKeyDown; }
+        }
+
+        public bool IsDead
+        {
+            get { return isDead; }
+        }
+
+        public override Vector2 SimPosition
+        {
+            get { return AnimController.limbs[0].SimPosition; }
+        }
+
+        public Vector2 Position
+        {
+            get { return ConvertUnits.ToDisplayUnits(AnimController.limbs[0].SimPosition); }
+        }
+
+        public Character(string file) : this(file, Vector2.Zero, null)
+        {
+        }
+
+        public Character(string file, Vector2 position)
+            : this(file, position, null)
+        {
+        }
+
+        public Character(CharacterInfo characterInfo, WayPoint spawnPoint, bool isNetworkPlayer = false)
+            : this(characterInfo.File, spawnPoint.SimPosition, characterInfo, isNetworkPlayer)
+        {
+
+        }
+
+        public Character(CharacterInfo characterInfo, Vector2 position, bool isNetworkPlayer = false)
+            : this(characterInfo.File, position, characterInfo, isNetworkPlayer)
+        {
+        }
+
+        public Character(string file, Vector2 position, CharacterInfo characterInfo = null, bool isNetworkPlayer = false)
+        {
+            selectKeyHit = new Key(false);
+            actionKeyDown = new Key(true);
+            actionKeyHit = new Key(false);
+            secondaryKeyHit = new Key(false);
+            secondaryKeyDown = new Key(true);
+
+            selectedItems = new Item[2];
+
+            IsNetworkPlayer = isNetworkPlayer;
+
+            oxygen = 100.0f;
+            //blood = 100.0f;
+            aiTarget = new AITarget(this);
+
+            Properties = ObjectProperty.GetProperties(this);
+
+            Info = characterInfo==null ? new CharacterInfo(file) : characterInfo;
+
+            XDocument doc = ToolBox.TryLoadXml(file);
+            if (doc == null) return;
+            
+            SpeciesName = ToolBox.GetAttributeString(doc.Root, "name", "Unknown");
+
+            isHumanoid = ToolBox.GetAttributeBool(doc.Root, "humanoid", false);
+            
+            if (isHumanoid)
+            {
+                AnimController = new HumanoidAnimController(this, doc.Root.Element("ragdoll"));
+                AnimController.TargetDir = Direction.Right;
+                inventory = new CharacterInventory(10, this);
+            }
+            else
+            {
+                AnimController = new FishAnimController(this, doc.Root.Element("ragdoll"));
+                PressureProtection = 100.0f;
+                //FishAnimController fishAnim = (FishAnimController)animController;
+
+                aiController = new EnemyAIController(this, file);
+            }
+
+            foreach (Limb limb in AnimController.limbs)
+            {
+                limb.body.SetTransform(position+limb.SimPosition, 0.0f);
+                //limb.prevPosition = ConvertUnits.ToDisplayUnits(position);
+            }
+
+            maxHealth = ToolBox.GetAttributeFloat(doc.Root, "health", 100.0f);
+            health = maxHealth;
+
+            needsAir = ToolBox.GetAttributeBool(doc.Root, "needsair", false);
+            drowningTime = ToolBox.GetAttributeFloat(doc.Root, "drowningtime", 10.0f);
+
+            soundInterval = ToolBox.GetAttributeFloat(doc.Root, "soundinterval", 10.0f);
+
+            var soundElements = doc.Root.Elements("sound").ToList();
+            if (soundElements.Any())
+            {
+                sounds = new Sound[soundElements.Count()];
+                soundStates = new AIController.AiState[soundElements.Count()];
+                soundRange = new float[soundElements.Count()];
+                int i = 0;
+                foreach (XElement soundElement in soundElements)
+                {
+                    sounds[i] = Sound.Load(soundElement.Attribute("file").Value);
+                    soundRange[i] = ToolBox.GetAttributeFloat(soundElement, "range", 1000.0f);
+                    if (soundElement.Attribute("state") == null)
+                    {
+                        soundStates[i] = AIController.AiState.None;
+                    }
+                    else
+                    {
+                        soundStates[i] = (AIController.AiState)Enum.Parse(
+                            typeof(AIController.AiState), soundElement.Attribute("state").Value, true);
+                    }
+                    i++;
+                }
+            }
+
+            if (Info.PickedItemIDs.Any())
+            {
+                foreach (int id in Info.PickedItemIDs)
+                {
+                    Item item = FindEntityByID(id) as Item;
+                    if (item == null) continue;
+
+                    item.Pick(this);
+                }
+            }
+
+            AnimController.FindHull();
+
+            CharacterList.Add(this);
+        }
+
+        private static string humanConfigFile;
+        public static string HumanConfigFile
+        {
+            get 
+            {
+                if (string.IsNullOrEmpty(humanConfigFile))
+                {
+                    var characterFiles = Game1.SelectedPackage.GetFilesOfType(ContentType.Character);
+
+                    humanConfigFile = characterFiles.Find(c => c.EndsWith("human.xml"));
+                    if (humanConfigFile == null)
+                    {
+                        DebugConsole.ThrowError("Couldn't find a config file for humans from the selected content package!");
+                        DebugConsole.ThrowError("(The config file must end with ''human.xml'')");
+                        return "";
+                    }
+                }
+                return humanConfigFile; 
+            }
+        }
+
+        public void GiveJobItems(WayPoint spawnPoint)
+        {
+            if (Info == null || Info.Job == null) return;
+            
+            foreach (string itemName in Info.Job.SpawnItemNames)
+            {
+                ItemPrefab itemPrefab = ItemPrefab.list.Find(ip => ip.Name == itemName) as ItemPrefab;
+                if (itemPrefab == null)
+                {
+                    DebugConsole.ThrowError("Tried to spawn ''" + Name + "'' with the item ''" + itemName + "''. Matching item prefab not found.");
+                    continue;
+                }
+
+                Item item = new Item(itemPrefab, Position);
+                inventory.TryPutItem(item, item.AllowedSlots, false);
+                
+                if (item.Prefab.Name == "ID Card" && spawnPoint!=null)
+                {
+                    foreach (string s in spawnPoint.IdCardTags)
+                    {
+                        
+                        item.AddTag(s);
+                    }                    
+                }
+            }            
+        }
+
+        public int GetSkillLevel(string skillName)
+        {
+            return Info.Job.GetSkillLevel(skillName);
+        }
+
+        public void Control(float deltaTime, Camera cam, bool forcePick = false)
+        {
+            if (isDead) return;
+
+            //find the closest item if selectkey has been hit, or if the character is being
+            //controlled by the player (in order to highlight it)
+            //closestItem = null;
+            if (controlled==this)
+            {
+                Vector2 mouseSimPos = ConvertUnits.ToSimUnits(cam.ScreenToWorld(PlayerInput.MousePosition));
+                closestItem = FindClosestItem(mouseSimPos);
+
+                if (closestItem != null)
+                {
+                    closestItem.IsHighlighted = true;
+                    if (selectKeyHit.State && closestItem.Pick(this, forcePick))
+                    {
+                        new NetworkEvent(NetworkEventType.PickItem, ID, true, closestItem.ID);
+                    }
+                }
+            }
+
+            for (int i = 0; i < selectedItems.Length; i++ )
+            {
+                if (selectedItems[i] == null) continue;
+                if (i == 1 && selectedItems[0] == selectedItems[1]) continue;
+                
+                if (actionKeyDown.State) selectedItems[i].Use(deltaTime, this);
+                if (secondaryKeyDown.State && selectedItems[i] != null) selectedItems[i].SecondaryUse(deltaTime, this);
+                
+            }
+
+            if (selectedConstruction != null)
+            {
+                if (actionKeyDown.State) selectedConstruction.Use(deltaTime, this);
+                if (secondaryKeyDown.State) selectedConstruction.SecondaryUse(deltaTime, this);
+            }
+
+            if (IsNetworkPlayer)
+            {
+                selectKeyHit.Reset();
+                actionKeyHit.Reset();
+                actionKeyDown.Reset();
+                secondaryKeyHit.Reset();
+                secondaryKeyDown.Reset();
+            }
+        }
+
+        private Item FindClosestItem(Vector2 mouseSimPos)
+        {
+            Limb torso = AnimController.GetLimb(LimbType.Torso);
+            Vector2 pos = (torso.body.TargetPosition != Vector2.Zero) ? torso.body.TargetPosition : torso.SimPosition;
+
+            return Item.FindPickable(pos, selectedConstruction == null ? mouseSimPos : selectedConstruction.SimPosition, null, selectedItems);
+        }
+
+        /// <summary>
+        /// Control the character according to player input
+        /// </summary>
+        public void ControlLocalPlayer(Camera cam, bool moveCam = true)
+        {
+            //if (isDead)
+            //{
+
+            //    return;
+            //}
+
+            Limb head = AnimController.GetLimb(LimbType.Head);
+
+            Lights.LightManager.ViewPos = ConvertUnits.ToDisplayUnits(head.SimPosition);
+
+            Vector2 targetMovement = Vector2.Zero;
+
+            if (!DisableControls)
+            {
+                if (PlayerInput.KeyDown(Keys.W)) targetMovement.Y += 1.0f;
+                if (PlayerInput.KeyDown(Keys.S)) targetMovement.Y -= 1.0f;
+                if (PlayerInput.KeyDown(Keys.A)) targetMovement.X -= 1.0f;
+                if (PlayerInput.KeyDown(Keys.D)) targetMovement.X += 1.0f;
+
+                //the vertical component is only used for falling through platforms and climbing ladders when not in water,
+                //so the movement can't be normalized or the character would walk slower when pressing down/up
+                if (AnimController.InWater)
+                {
+                    float length = targetMovement.Length();
+                    if (length > 0.0f) targetMovement = targetMovement / length;
+                }
+
+                if (Keyboard.GetState().IsKeyDown(Keys.LeftShift) && Math.Sign(targetMovement.X) == Math.Sign(AnimController.Dir))
+                    targetMovement *= 3.0f;
+
+                selectKeyHit.SetState(PlayerInput.KeyHit(Keys.E));
+                actionKeyHit.SetState(PlayerInput.LeftButtonClicked());
+                actionKeyDown.SetState(PlayerInput.GetMouseState.LeftButton == ButtonState.Pressed);
+                secondaryKeyHit.SetState(PlayerInput.RightButtonClicked());
+                secondaryKeyDown.SetState(PlayerInput.GetMouseState.RightButton == ButtonState.Pressed);
+            }
+            else
+            {
+                selectKeyHit.SetState(false);
+                actionKeyHit.SetState(false);
+                actionKeyDown.SetState(false);
+                secondaryKeyHit.SetState(false);
+                secondaryKeyDown.SetState(false);
+            }
+
+            AnimController.TargetMovement = targetMovement;
+            AnimController.IsStanding = true;
+
+            if (moveCam)
+            {
+                cam.TargetPos = ConvertUnits.ToDisplayUnits(AnimController.limbs[0].SimPosition);
+                cam.OffsetAmount = MathHelper.Lerp(cam.OffsetAmount, 250.0f, 0.05f);
+            }
+            
+            cursorPosition = cam.ScreenToWorld(PlayerInput.MousePosition);            
+            Vector2 mouseSimPos = ConvertUnits.ToSimUnits(cursorPosition);
+            if (Vector2.Distance(AnimController.limbs[0].SimPosition, mouseSimPos)>1.0f)
+            {
+                Body body = Submarine.PickBody(AnimController.limbs[0].SimPosition, mouseSimPos);
+                Structure structure = null;
+                if (body != null) structure = body.UserData as Structure;
+                if (structure != null)
+                {
+                    if (!structure.CastShadow && moveCam)
+                    {
+                        cam.OffsetAmount = MathHelper.Lerp(cam.OffsetAmount, 500.0f, 0.05f);
+                    }
+                }
+            }
+
+
+            if (AnimController.onGround &&
+                !AnimController.InWater &&
+                AnimController.Anim != AnimController.Animation.UsingConstruction)
+            {                
+                if (mouseSimPos.X < head.SimPosition.X-1.0f)
+                {
+                    AnimController.TargetDir = Direction.Left;
+                }
+                else if (mouseSimPos.X > head.SimPosition.X + 1.0f)
+                {
+                    AnimController.TargetDir = Direction.Right;
+                }
+            }
+
+            DisableControls = false;
+        }
+        
+
+        public static void UpdateAnimAll(float deltaTime)
+        {
+            foreach (Character c in CharacterList)
+            {
+                if (c.isDead) continue;
+                c.AnimController.UpdateAnim(deltaTime);
+            }
+        }
+        
+        public static void UpdateAll(Camera cam, float deltaTime)
+        {
+            if (NewCharacterQueue.Count>0)
+            {
+                new Character(NewCharacterQueue.Dequeue(), Vector2.Zero);
+            }
+
+            foreach (Character c in CharacterList)
+            {
+                c.Update(cam, deltaTime);
+            }
+        }
+
+        public void Update(Camera cam, float deltaTime)
+        {
+            if (isDead)
+            {
+                if (controlled == this)
+                {
+                    cam.Zoom = MathHelper.Lerp(cam.Zoom, 1.5f, 0.1f);
+                    cam.TargetPos = ConvertUnits.ToDisplayUnits(AnimController.limbs[0].SimPosition);
+                    cam.OffsetAmount = 0.0f;
+                }
+                return;
+            }
+
+            if (PressureProtection==0.0f && 
+                (AnimController.CurrentHull == null || AnimController.CurrentHull.LethalPressure >= 100.0f))
+            {
+                Implode();
+                return;
+            }
+
+            if (controlled == this) ControlLocalPlayer(cam);
+
+            Control(deltaTime, cam);
+
+            UpdateSightRange();
+            aiTarget.SoundRange = 0.0f;
+
+            if (needsAir)
+            {
+                if (AnimController.HeadInWater)
+                {
+                    Oxygen -= deltaTime*100.0f / drowningTime;
+                }
+                else if (AnimController.CurrentHull != null)
+                {
+                    float hullOxygen = AnimController.CurrentHull.OxygenPercentage;
+                    hullOxygen -= 30.0f;
+
+                    Oxygen += deltaTime * 100.0f * (hullOxygen / 500.0f);
+
+                    AnimController.CurrentHull.Oxygen -= Hull.OxygenConsumptionSpeed * deltaTime;
+                }
+                PressureProtection -= deltaTime*100.0f;
+            }
+
+            if (soundTimer > 0)
+            {
+                soundTimer -= deltaTime;
+            }
+            else
+            {
+                PlaySound((aiController == null) ? AIController.AiState.None : aiController.State);
+                soundTimer = soundInterval;
+            }
+
+            //foreach (Limb limb in animController.limbs)
+            //{
+                Health = health - bleeding * deltaTime;
+            //}
+
+            if (aiController != null) aiController.Update(deltaTime);
+        }
+
+        private void UpdateSightRange()
+        {
+            aiTarget.SightRange = 0.0f;
+
+            //distance is approximated based on the mass of the character 
+            //(which corresponds to size because all the characters have the same limb density)
+            foreach (Limb limb in AnimController.limbs)
+            {
+                aiTarget.SightRange += limb.Mass * 1000.0f;
+            }
+            //the faster the character is moving, the easier it is to see it
+            Limb torso = AnimController.GetLimb(LimbType.Torso);
+            if (torso !=null)
+            {
+                aiTarget.SightRange += torso.LinearVelocity.Length() * 500.0f;
+            }
+        }
+        
+        public void Draw(SpriteBatch spriteBatch)
+        {
+            AnimController.Draw(spriteBatch);
+            
+            //GUI.DrawLine(spriteBatch, ConvertUnits.ToDisplayUnits(animController.limbs[0].SimPosition.X, animController.limbs[0].SimPosition.Y),
+            //    ConvertUnits.ToDisplayUnits(animController.limbs[0].SimPosition.X, animController.limbs[0].SimPosition.Y) +
+            //    ConvertUnits.ToDisplayUnits(animController.targetMovement.X, animController.targetMovement.Y), Color.Green);
+        }
+
+        public void DrawFront(SpriteBatch spriteBatch)
+        {
+            if (IsNetworkPlayer)
+            {
+                Vector2 namePos = new Vector2(Position.X, -Position.Y - 80.0f) - GUI.Font.MeasureString(Info.Name) * 0.5f;
+                spriteBatch.DrawString(GUI.Font, Info.Name, namePos - new Vector2(1.0f, 1.0f), Color.Black);
+                spriteBatch.DrawString(GUI.Font, Info.Name, namePos, Color.White);
+
+                if (Game1.DebugDraw)
+                {
+                    spriteBatch.DrawString(GUI.Font, ID.ToString(), namePos - new Vector2(0.0f, 20.0f), Color.White);
+                }
+            }
+
+            Vector2 pos = ConvertUnits.ToDisplayUnits(AnimController.limbs[0].SimPosition);
+            pos.Y = -pos.Y;
+            
+            if (this == Character.controlled) return;
+
+            Vector2 healthBarPos = new Vector2(Position.X - 50, -Position.Y - 50.0f);
+            GUI.DrawRectangle(spriteBatch, new Rectangle((int)healthBarPos.X - 2, (int)healthBarPos.Y - 2, 100 + 4, 15 + 4), Color.Black, false);
+            GUI.DrawRectangle(spriteBatch, new Rectangle((int)healthBarPos.X, (int)healthBarPos.Y, (int)(100.0f * (health / maxHealth)), 15), Color.Red, true);
+
+
+            //GUI.DrawLine(spriteBatch, ConvertUnits.ToDisplayUnits(animController.limbs[0].SimPosition.X, animController.limbs[0].SimPosition.Y),
+            //    ConvertUnits.ToDisplayUnits(animController.limbs[0].SimPosition.X, animController.limbs[0].SimPosition.Y) +
+            //    ConvertUnits.ToDisplayUnits(animController.targetMovement.X, animController.targetMovement.Y), Color.Green);
+        }
+
+
+        private static GUIProgressBar drowningBar, healthBar;
+        public void DrawHud(SpriteBatch spriteBatch, Camera cam)
+        {
+            if (drowningBar==null)
+            {
+                int width = 100, height = 20;
+                drowningBar = new GUIProgressBar(new Rectangle(20, Game1.GraphicsHeight/2, width, height), Color.Blue, 1.0f);
+
+                healthBar = new GUIProgressBar(new Rectangle(20, Game1.GraphicsHeight / 2 + 30, width, height), Color.Red, 1.0f);
+            }
+
+            drowningBar.BarSize = Controlled.Oxygen / 100.0f;
+            if (drowningBar.BarSize < 0.95f) drowningBar.Draw(spriteBatch);
+
+            healthBar.BarSize = health / maxHealth;
+            if (healthBar.BarSize < 1.0f) healthBar.Draw(spriteBatch);
+
+            if (Controlled.Inventory != null) Controlled.Inventory.Draw(spriteBatch);
+
+            if (closestItem != null && selectedConstruction==null)
+            {
+                Color color = Color.Orange;
+
+                Vector2 startPos = Position + (closestItem.Position - Position) * 0.7f;
+                startPos = cam.WorldToScreen(startPos);
+
+                Vector2 textPos = startPos;
+
+                float stringWidth = GUI.Font.MeasureString(closestItem.Prefab.Name).X;
+                textPos -= new Vector2(stringWidth / 2, 20);
+                spriteBatch.DrawString(GUI.Font, closestItem.Prefab.Name, textPos, Color.Black);
+                spriteBatch.DrawString(GUI.Font, closestItem.Prefab.Name, textPos + new Vector2(1, -1), Color.Orange);
+                
+                textPos.Y += 50.0f;
+                foreach (ColoredText coloredText in closestItem.GetHUDTexts(Controlled))
+                {
+                    textPos.X = startPos.X - GUI.Font.MeasureString(coloredText.text).X / 2;
+
+                    spriteBatch.DrawString(GUI.Font, coloredText.text, textPos, Color.Black);
+                    spriteBatch.DrawString(GUI.Font, coloredText.text, textPos + new Vector2(1, -1), coloredText.color);
+
+                    textPos.Y += 25;
+                }                
+            }
+            
+        }
+
+        public void PlaySound(AIController.AiState state)
+        {
+            if (sounds == null || !sounds.Any()) return;
+            var matchingSoundStates = soundStates.Where(x => x == state).ToList();
+
+            int selectedSound = Rand.Int(matchingSoundStates.Count());
+
+            int n = 0;
+            for (int i = 0; i < sounds.Count(); i++)
+            {
+                if (soundStates[i] != state) continue;
+                if (n == selectedSound)
+                {
+                    sounds[i].Play(1.0f, 2000.0f,
+                            AnimController.limbs[0].body.FarseerBody);
+                    Debug.WriteLine("playing: " + sounds[i]);
+                    return;
+                }
+                n++;
+            }
+        }
+
+        public AttackResult AddDamage(Vector2 position, DamageType damageType, float amount, float bleedingAmount, float stun, bool playSound = false)
+        {
+            AnimController.StunTimer = Math.Max(AnimController.StunTimer, stun);
+
+            Limb closestLimb = null;
+            float closestDistance = 0.0f;
+            foreach (Limb limb in AnimController.limbs)
+            {
+                float distance = Vector2.Distance(position, limb.SimPosition);
+                if (closestLimb == null || distance < closestDistance)
+                {
+                    closestLimb = limb;
+                    closestDistance = distance;
+                }
+            }
+
+            Vector2 pull = position - closestLimb.SimPosition;
+            if (pull != Vector2.Zero) pull = Vector2.Normalize(pull);
+            closestLimb.body.ApplyForce(pull*Math.Min(amount*100.0f, 100.0f));
+
+
+            AttackResult attackResult = closestLimb.AddDamage(position, damageType, amount, bleedingAmount, playSound);
+            health -= attackResult.Damage;
+            bleeding += attackResult.Bleeding;
+
+            return attackResult;
+
+        }
+
+        public void Stun()
+        {
+            //for (int i = 0; i < selectedItems.Length; i++ )
+            //{
+            //    if (selectedItems[i] == null) continue;
+            //    selectedItems[i].Drop();
+            //    selectedItems[i] = null;
+            //}
+                
+            selectedConstruction = null;
+        }
+
+        private void Implode()
+        {
+            Limb torso= AnimController.GetLimb(LimbType.Torso);
+            if (torso == null) torso = AnimController.GetLimb(LimbType.Head);
+
+            Vector2 centerOfMass = Vector2.Zero;
+            foreach (Limb limb in AnimController.limbs)
+            {
+                centerOfMass += limb.Mass * limb.SimPosition;
+            }
+
+            centerOfMass /= AnimController.Mass;
+
+            health = 0.0f;
+
+            foreach (Limb limb in AnimController.limbs)
+            {
+                Vector2 diff = centerOfMass - limb.SimPosition;
+                if (diff == Vector2.Zero) continue;
+                limb.body.ApplyLinearImpulse(diff * 10.0f);
+               // limb.Damage = 100.0f;
+            }
+
+            AmbientSoundManager.PlayDamageSound(DamageSoundType.Implode, 50.0f, torso.body.FarseerBody);
+            
+            for (int i = 0; i < 10; i++)
+            {
+                Particle p = Game1.ParticleManager.CreateParticle("waterblood",
+                    torso.SimPosition + new Vector2(Rand.Range(-0.5f, 0.5f), Rand.Range(-0.5f, 0.5f)),
+                    Vector2.Zero);
+                if (p!=null) p.Size *= 2.0f;
+
+                Game1.ParticleManager.CreateParticle("bubbles",
+                    torso.SimPosition,
+                    new Vector2(Rand.Range(-0.5f, 0.5f), Rand.Range(-1.0f,0.5f)));
+            }
+
+            foreach (var joint in AnimController.limbJoints)
+            {
+                joint.LimitEnabled = false;
+            }
+            Kill(true);
+        }
+
+        public void Kill(bool networkMessage = false)
+        {
+            if (isDead) return;
+
+            //if the game is run by a client, characters are only killed when the server says so
+            if (Game1.Client != null)
+            {
+                if (networkMessage)
+                {
+                    new NetworkEvent(NetworkEventType.KillCharacter, ID, true);
+                }
+                else
+                {
+                    return;
+                }
+            }
+
+            isDead = true;
+            AnimController.movement = Vector2.Zero;
+            AnimController.TargetMovement = Vector2.Zero;
+
+            for (int i = 0; i < selectedItems.Length; i++ )
+            {
+                if (selectedItems[i] != null) selectedItems[i].Drop(this);            
+            }
+
+                
+            aiTarget.Remove();
+            aiTarget = null;
+
+            foreach (Limb limb in AnimController.limbs)
+            {
+                if (limb.pullJoint == null) continue;
+                limb.pullJoint.Enabled = false;
+            }
+
+            foreach (RevoluteJoint joint in AnimController.limbJoints)
+            {
+                joint.MotorEnabled = false;
+                joint.MaxMotorTorque = 0.0f;
+            }
+
+            if (Game1.Server != null)
+            {
+                new NetworkEvent(NetworkEventType.KillCharacter, ID, false);
+            }
+
+            if (Game1.GameSession != null)
+            {
+                Game1.GameSession.KillCharacter(this);
+            }
+        }
+
+        public override void FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data)
+        {
+            if (type == NetworkEventType.PickItem)
+            {
+                message.Write((int)data);
+                Debug.WriteLine("pickitem");
+                return;
+            }
+            else if (type == NetworkEventType.KillCharacter)
+            {
+                return;
+            }
+
+
+            //if (type == Networking.NetworkEventType.KeyHit)
+            //{
+            //    message.Write(selectKeyHit.Dequeue);
+                message.Write(actionKeyDown.Dequeue);
+                message.Write(secondaryKeyDown.Dequeue);
+            //}
+
+            message.Write(NetTime.Now);
+
+            // Write byte = move direction
+            message.Write(AnimController.TargetMovement.X);
+            message.Write(AnimController.TargetMovement.Y);
+
+            message.Write(AnimController.TargetDir==Direction.Right);
+
+            message.Write(cursorPosition.X);
+            message.Write(cursorPosition.Y);
+            
+            message.Write(LargeUpdateTimer <= 0);
+
+            if (LargeUpdateTimer<=0)
+            {
+                int i = 0;
+                foreach (Limb limb in AnimController.limbs)
+                {
+                    message.Write(limb.body.Position.X);
+                    message.Write(limb.body.Position.Y);
+
+                    message.Write(limb.body.LinearVelocity.X);
+                    message.Write(limb.body.LinearVelocity.Y);
+
+                    message.Write(limb.body.Rotation);
+                    message.Write(limb.body.AngularVelocity);
+                    i++;
+                }
+
+                message.Write(AnimController.StunTimer);
+                message.Write((byte)health);
+
+                LargeUpdateTimer = 5;
+            }
+            else
+            {
+                Limb torso = AnimController.GetLimb(LimbType.Torso);
+                message.Write(torso.body.Position.X);
+                message.Write(torso.body.Position.Y);
+
+                LargeUpdateTimer = Math.Max(0, LargeUpdateTimer-1);
+            }
+
+
+
+            if (aiController != null) aiController.FillNetworkData(message);
+            
+        }
+
+        public override void ReadNetworkData(NetworkEventType type, NetIncomingMessage message)
+        {
+            if (type == NetworkEventType.PickItem)
+            {
+                int itemId = -1;
+
+                try
+                {
+                    itemId = message.ReadInt32();
+                }
+                catch
+                {
+                    return;
+                }
+
+                Item item = FindEntityByID(itemId) as Item;
+                if (item != null)
+                {
+                    Debug.WriteLine("pickitem "+itemId );
+                    item.Pick(this);
+                }
+
+                return;
+            } 
+            else if (type == NetworkEventType.KillCharacter)
+            {
+                Kill(true);
+                if (Game1.Client != null && controlled == this)
+                {
+                    Game1.Client.AddChatMessage("YOU HAVE DIED. Your chat messages will only be visible to other dead players.", ChatMessageType.Dead);
+                    Game1.LightManager.LosEnabled = false;
+                }
+                return;
+            }
+
+            bool actionKeyState     = false;
+            bool secondaryKeyState  = false;
+            double sendingTime      = 0.0f;
+            Vector2 targetMovement  = Vector2.Zero;
+            bool targetDir          = false;
+            Vector2 cursorPos       = Vector2.Zero;
+
+            try
+            {
+                actionKeyState      = message.ReadBoolean();
+                secondaryKeyState   = message.ReadBoolean();
+            
+                sendingTime         = message.ReadDouble();
+
+                targetMovement      = new Vector2 (message.ReadFloat(), message.ReadFloat());
+                targetDir           = message.ReadBoolean();
+
+                cursorPos           = new Vector2(message.ReadFloat(), message.ReadFloat());
+            }
+
+            catch
+            {
+                return;
+            }
+
+            AnimController.IsStanding = true;
+
+            actionKeyDown.State = actionKeyState;
+            secondaryKeyDown.State = secondaryKeyState;
+
+            if (sendingTime <= LastNetworkUpdate) return;
+            
+            cursorPosition = cursorPos;
+
+            AnimController.TargetMovement= targetMovement;
+            AnimController.TargetDir = (targetDir) ? Direction.Right : Direction.Left;
+                
+            if (message.ReadBoolean())
+            {
+                foreach (Limb limb in AnimController.limbs)
+                {
+                    Vector2 pos = Vector2.Zero, vel = Vector2.Zero;
+                    float rotation = 0.0f, angularVel = 0.0f;
+
+                    try
+                    {
+                        pos.X = message.ReadFloat();
+                        pos.Y = message.ReadFloat();
+
+                        vel.X = message.ReadFloat();
+                        vel.Y = message.ReadFloat();
+
+                        rotation = message.ReadFloat();
+                        angularVel = message.ReadFloat();
+                    }
+                    catch
+                    {
+                        return;
+                    }
+
+                    if (limb.body != null)
+                    {
+                        limb.body.TargetVelocity = vel;
+                        limb.body.TargetPosition = pos;// +vel * (float)(deltaTime / 60.0);
+                        limb.body.TargetRotation = rotation;// +angularVel * (float)(deltaTime / 60.0);
+                        limb.body.TargetAngularVelocity = angularVel;
+                    }
+
+                }
+
+                float newStunTimer = 0.0f, newHealth = 0.0f;
+
+                try
+                {
+                    newStunTimer = message.ReadFloat();
+                    newHealth = message.ReadByte();
+                }
+                catch { return; }
+
+                AnimController.StunTimer = newStunTimer;
+                Health = newHealth;
+
+                LargeUpdateTimer = 1;
+            }
+            else
+            {
+                Vector2 pos = Vector2.Zero;
+                try
+                {
+                    pos.X = message.ReadFloat();
+                    pos.Y = message.ReadFloat();
+                }
+
+                catch { return; }
+
+
+                Limb torso = AnimController.GetLimb(LimbType.Torso);
+                torso.body.TargetPosition = pos;
+
+                LargeUpdateTimer = 0;
+            }
+
+            if (aiController != null) aiController.ReadNetworkData(message);
+
+            LastNetworkUpdate = sendingTime;
+            
+        }
+
+        public override void Remove()
+        {
+            base.Remove();
+
+            CharacterList.Remove(this);
+
+            if (controlled == this) controlled = null;
+
+            if (Game1.Client!=null && Game1.Client.Character == this) Game1.Client.Character = null;
+
+            if (inventory != null) inventory.Remove();
+
+            if (aiTarget != null)
+                aiTarget.Remove();
+
+            if (AnimController!=null)
+                AnimController.Remove();
+        }
+
+    }
+}
diff --git a/Subsurface/Characters/CharacterInfo.cs b/Subsurface/Source/Characters/CharacterInfo.cs
similarity index 100%
rename from Subsurface/Characters/CharacterInfo.cs
rename to Subsurface/Source/Characters/CharacterInfo.cs
diff --git a/Subsurface/Characters/DelayedEffect.cs b/Subsurface/Source/Characters/DelayedEffect.cs
similarity index 100%
rename from Subsurface/Characters/DelayedEffect.cs
rename to Subsurface/Source/Characters/DelayedEffect.cs
diff --git a/Subsurface/Characters/FishAnimController.cs b/Subsurface/Source/Characters/FishAnimController.cs
similarity index 100%
rename from Subsurface/Characters/FishAnimController.cs
rename to Subsurface/Source/Characters/FishAnimController.cs
diff --git a/Subsurface/Characters/HumanoidAnimController.cs b/Subsurface/Source/Characters/HumanoidAnimController.cs
similarity index 100%
rename from Subsurface/Characters/HumanoidAnimController.cs
rename to Subsurface/Source/Characters/HumanoidAnimController.cs
diff --git a/Subsurface/Characters/Jobs/Job.cs b/Subsurface/Source/Characters/Jobs/Job.cs
similarity index 100%
rename from Subsurface/Characters/Jobs/Job.cs
rename to Subsurface/Source/Characters/Jobs/Job.cs
diff --git a/Subsurface/Characters/Jobs/JobPrefab.cs b/Subsurface/Source/Characters/Jobs/JobPrefab.cs
similarity index 100%
rename from Subsurface/Characters/Jobs/JobPrefab.cs
rename to Subsurface/Source/Characters/Jobs/JobPrefab.cs
diff --git a/Subsurface/Characters/Limb.cs b/Subsurface/Source/Characters/Limb.cs
similarity index 100%
rename from Subsurface/Characters/Limb.cs
rename to Subsurface/Source/Characters/Limb.cs
diff --git a/Subsurface/Characters/Ragdoll.cs b/Subsurface/Source/Characters/Ragdoll.cs
similarity index 100%
rename from Subsurface/Characters/Ragdoll.cs
rename to Subsurface/Source/Characters/Ragdoll.cs
diff --git a/Subsurface/Characters/StatusEffect.cs b/Subsurface/Source/Characters/StatusEffect.cs
similarity index 100%
rename from Subsurface/Characters/StatusEffect.cs
rename to Subsurface/Source/Characters/StatusEffect.cs
diff --git a/Subsurface/ContentPackage.cs b/Subsurface/Source/ContentPackage.cs
similarity index 97%
rename from Subsurface/ContentPackage.cs
rename to Subsurface/Source/ContentPackage.cs
index 1fddd191e..16f2dd94b 100644
--- a/Subsurface/ContentPackage.cs
+++ b/Subsurface/Source/ContentPackage.cs
@@ -54,6 +54,12 @@ namespace Subsurface
         {
             XDocument doc = ToolBox.TryLoadXml(filePath);
 
+            if (doc==null)
+            {
+                DebugConsole.ThrowError("Couldn't load content package ''"+filePath+"''!");
+                return;
+            }
+
             Path = filePath;
 
             name = ToolBox.GetAttributeString(doc.Root, "name", "");
diff --git a/Subsurface/CoroutineManager.cs b/Subsurface/Source/CoroutineManager.cs
similarity index 100%
rename from Subsurface/CoroutineManager.cs
rename to Subsurface/Source/CoroutineManager.cs
diff --git a/Subsurface/DebugConsole.cs b/Subsurface/Source/DebugConsole.cs
similarity index 96%
rename from Subsurface/DebugConsole.cs
rename to Subsurface/Source/DebugConsole.cs
index 0844322dc..d1541fa83 100644
--- a/Subsurface/DebugConsole.cs
+++ b/Subsurface/Source/DebugConsole.cs
@@ -136,6 +136,12 @@ namespace Subsurface
 
         public static void ExecuteCommand(string command, Game1 game)
         {
+            if (Game1.Client!=null)
+            {
+                ThrowError("Console commands are disabled in multiplayer mode");
+                return;
+            }
+
             if (command == "") return;
             string[] commands = command.Split(' ');
 
@@ -253,12 +259,12 @@ namespace Subsurface
                     if (commands.Length < 2) break;
                     Submarine.Load("Content/SavedMaps/" + string.Join(" ", commands.Skip(1)));
                     break;
-                case "savegame":
-                    SaveUtil.SaveGame(SaveUtil.SaveFolder+"save");
-                    break;
-                case "loadgame":
-                    SaveUtil.LoadGame(SaveUtil.SaveFolder + "save");
-                    break;
+                //case "savegame":
+                //    SaveUtil.SaveGame();
+                //    break;
+                //case "loadgame":
+                //    SaveUtil.LoadGame(SaveUtil.SaveFolder + "save");
+                //    break;
                 case "messagebox":
                     if (commands.Length < 3) break;
                     new GUIMessageBox(commands[1], commands[2]);
diff --git a/Subsurface/EventInput/EventInput.cs b/Subsurface/Source/EventInput/EventInput.cs
similarity index 100%
rename from Subsurface/EventInput/EventInput.cs
rename to Subsurface/Source/EventInput/EventInput.cs
diff --git a/Subsurface/EventInput/KeyboardDispatcher.cs b/Subsurface/Source/EventInput/KeyboardDispatcher.cs
similarity index 100%
rename from Subsurface/EventInput/KeyboardDispatcher.cs
rename to Subsurface/Source/EventInput/KeyboardDispatcher.cs
diff --git a/Subsurface/Events/MonsterEvent.cs b/Subsurface/Source/Events/MonsterEvent.cs
similarity index 100%
rename from Subsurface/Events/MonsterEvent.cs
rename to Subsurface/Source/Events/MonsterEvent.cs
diff --git a/Subsurface/Events/PropertyTask.cs b/Subsurface/Source/Events/PropertyTask.cs
similarity index 100%
rename from Subsurface/Events/PropertyTask.cs
rename to Subsurface/Source/Events/PropertyTask.cs
diff --git a/Subsurface/Events/Quests/MonsterQuest.cs b/Subsurface/Source/Events/Quests/MonsterQuest.cs
similarity index 100%
rename from Subsurface/Events/Quests/MonsterQuest.cs
rename to Subsurface/Source/Events/Quests/MonsterQuest.cs
diff --git a/Subsurface/Events/Quests/Quest.cs b/Subsurface/Source/Events/Quests/Quest.cs
similarity index 90%
rename from Subsurface/Events/Quests/Quest.cs
rename to Subsurface/Source/Events/Quests/Quest.cs
index 2296522b8..bf8b27fc7 100644
--- a/Subsurface/Events/Quests/Quest.cs
+++ b/Subsurface/Source/Events/Quests/Quest.cs
@@ -121,8 +121,16 @@ namespace Subsurface
                     object instance = constructor.Invoke(new object[] { element });
 
                     Quest quest = (Quest)instance;
-                    quest.description = quest.description.Replace("[location1]", locations[0].Name);
-                    quest.description = quest.description.Replace("[location2]", locations[1].Name);
+
+                    for (int n = 0; n<2; n++)
+                    {
+                        quest.description = quest.description.Replace("[location"+(n+1)+"]", locations[n].Name);
+
+                        quest.successMessage = quest.successMessage.Replace("[location" + (n + 1) + "]", locations[n].Name);
+                        quest.failureMessage = quest.failureMessage.Replace("[location" + (n + 1) + "]", locations[n].Name);
+                    }
+
+
 
                     return quest;
                 }
diff --git a/Subsurface/Events/Quests/SalvageQuest.cs b/Subsurface/Source/Events/Quests/SalvageQuest.cs
similarity index 100%
rename from Subsurface/Events/Quests/SalvageQuest.cs
rename to Subsurface/Source/Events/Quests/SalvageQuest.cs
diff --git a/Subsurface/Events/RepairTask.cs b/Subsurface/Source/Events/RepairTask.cs
similarity index 100%
rename from Subsurface/Events/RepairTask.cs
rename to Subsurface/Source/Events/RepairTask.cs
diff --git a/Subsurface/Events/ScriptedEvent.cs b/Subsurface/Source/Events/ScriptedEvent.cs
similarity index 100%
rename from Subsurface/Events/ScriptedEvent.cs
rename to Subsurface/Source/Events/ScriptedEvent.cs
diff --git a/Subsurface/Events/ScriptedTask.cs b/Subsurface/Source/Events/ScriptedTask.cs
similarity index 100%
rename from Subsurface/Events/ScriptedTask.cs
rename to Subsurface/Source/Events/ScriptedTask.cs
diff --git a/Subsurface/Events/Task.cs b/Subsurface/Source/Events/Task.cs
similarity index 100%
rename from Subsurface/Events/Task.cs
rename to Subsurface/Source/Events/Task.cs
diff --git a/Subsurface/Events/TaskManager.cs b/Subsurface/Source/Events/TaskManager.cs
similarity index 100%
rename from Subsurface/Events/TaskManager.cs
rename to Subsurface/Source/Events/TaskManager.cs
diff --git a/Subsurface/FrameCounter.cs b/Subsurface/Source/FrameCounter.cs
similarity index 100%
rename from Subsurface/FrameCounter.cs
rename to Subsurface/Source/FrameCounter.cs
diff --git a/Subsurface/GUI/ComponentStyle.cs b/Subsurface/Source/GUI/ComponentStyle.cs
similarity index 100%
rename from Subsurface/GUI/ComponentStyle.cs
rename to Subsurface/Source/GUI/ComponentStyle.cs
diff --git a/Subsurface/GUI/GUI.cs b/Subsurface/Source/GUI/GUI.cs
similarity index 92%
rename from Subsurface/GUI/GUI.cs
rename to Subsurface/Source/GUI/GUI.cs
index 5adb10e2f..d2c70d207 100644
--- a/Subsurface/GUI/GUI.cs
+++ b/Subsurface/Source/GUI/GUI.cs
@@ -79,11 +79,24 @@ namespace Subsurface
                         y += 60;
                     }
                 }
-
-                button = new GUIButton(new Rectangle(0, y, 0, 30), "Quit", Alignment.CenterX, GUI.style, pauseMenu);
                 
-                button.UserData = (int)MainMenuScreen.Tabs.Main;
-                button.OnClicked += Game1.MainMenuScreen.SelectTab;
+                if (Screen.Selected == Game1.LobbyScreen)
+                {
+                    SinglePlayerMode spMode = Game1.GameSession.gameMode as SinglePlayerMode;
+                    if (spMode != null)
+                    {
+                        button = new GUIButton(new Rectangle(0, y, 0, 30), "Save & quit", Alignment.CenterX, GUI.style, pauseMenu);
+                        button.OnClicked += QuitClicked;
+                        button.OnClicked += TogglePauseMenu;
+                        button.UserData = "save";
+
+                        y += 60;
+                    }
+                }
+
+
+                button = new GUIButton(new Rectangle(0, y, 0, 30), "Quit", Alignment.CenterX, GUI.style, pauseMenu);                
+                button.OnClicked += QuitClicked;
                 button.OnClicked += TogglePauseMenu;
             }
 
@@ -96,6 +109,20 @@ namespace Subsurface
             return true;
         }
 
+        private static bool QuitClicked(GUIButton button, object obj)
+        {
+            if (button.UserData as string == "save")
+            {
+                SaveUtil.SaveGame(Game1.GameSession.SaveFile);
+            }
+
+
+            Game1.MainMenuScreen.Select();
+            Game1.MainMenuScreen.SelectTab(null, (int)MainMenuScreen.Tabs.Main);
+
+            return true;
+        }
+
         public static void DrawLine(SpriteBatch sb, Vector2 start, Vector2 end, Color clr, float depth = 0.0f)
         {
             Vector2 edge = end - start;
diff --git a/Subsurface/GUI/GUIButton.cs b/Subsurface/Source/GUI/GUIButton.cs
similarity index 100%
rename from Subsurface/GUI/GUIButton.cs
rename to Subsurface/Source/GUI/GUIButton.cs
diff --git a/Subsurface/GUI/GUIComponent.cs b/Subsurface/Source/GUI/GUIComponent.cs
similarity index 100%
rename from Subsurface/GUI/GUIComponent.cs
rename to Subsurface/Source/GUI/GUIComponent.cs
diff --git a/Subsurface/GUI/GUIFrame.cs b/Subsurface/Source/GUI/GUIFrame.cs
similarity index 100%
rename from Subsurface/GUI/GUIFrame.cs
rename to Subsurface/Source/GUI/GUIFrame.cs
diff --git a/Subsurface/GUI/GUIImage.cs b/Subsurface/Source/GUI/GUIImage.cs
similarity index 100%
rename from Subsurface/GUI/GUIImage.cs
rename to Subsurface/Source/GUI/GUIImage.cs
diff --git a/Subsurface/GUI/GUIListBox.cs b/Subsurface/Source/GUI/GUIListBox.cs
similarity index 100%
rename from Subsurface/GUI/GUIListBox.cs
rename to Subsurface/Source/GUI/GUIListBox.cs
diff --git a/Subsurface/GUI/GUIMessage.cs b/Subsurface/Source/GUI/GUIMessage.cs
similarity index 100%
rename from Subsurface/GUI/GUIMessage.cs
rename to Subsurface/Source/GUI/GUIMessage.cs
diff --git a/Subsurface/GUI/GUIMessageBox.cs b/Subsurface/Source/GUI/GUIMessageBox.cs
similarity index 100%
rename from Subsurface/GUI/GUIMessageBox.cs
rename to Subsurface/Source/GUI/GUIMessageBox.cs
diff --git a/Subsurface/GUI/GUIProgressBar.cs b/Subsurface/Source/GUI/GUIProgressBar.cs
similarity index 100%
rename from Subsurface/GUI/GUIProgressBar.cs
rename to Subsurface/Source/GUI/GUIProgressBar.cs
diff --git a/Subsurface/GUI/GUIScrollBar.cs b/Subsurface/Source/GUI/GUIScrollBar.cs
similarity index 100%
rename from Subsurface/GUI/GUIScrollBar.cs
rename to Subsurface/Source/GUI/GUIScrollBar.cs
diff --git a/Subsurface/GUI/GUIStyle.cs b/Subsurface/Source/GUI/GUIStyle.cs
similarity index 100%
rename from Subsurface/GUI/GUIStyle.cs
rename to Subsurface/Source/GUI/GUIStyle.cs
diff --git a/Subsurface/GUI/GUITextBlock.cs b/Subsurface/Source/GUI/GUITextBlock.cs
similarity index 100%
rename from Subsurface/GUI/GUITextBlock.cs
rename to Subsurface/Source/GUI/GUITextBlock.cs
diff --git a/Subsurface/GUI/GUITextBox.cs b/Subsurface/Source/GUI/GUITextBox.cs
similarity index 100%
rename from Subsurface/GUI/GUITextBox.cs
rename to Subsurface/Source/GUI/GUITextBox.cs
diff --git a/Subsurface/GUI/GUITickBox.cs b/Subsurface/Source/GUI/GUITickBox.cs
similarity index 100%
rename from Subsurface/GUI/GUITickBox.cs
rename to Subsurface/Source/GUI/GUITickBox.cs
diff --git a/Subsurface/GUI/TitleScreen.cs b/Subsurface/Source/GUI/TitleScreen.cs
similarity index 100%
rename from Subsurface/GUI/TitleScreen.cs
rename to Subsurface/Source/GUI/TitleScreen.cs
diff --git a/Subsurface/Game1.cs b/Subsurface/Source/Game1.cs
similarity index 99%
rename from Subsurface/Game1.cs
rename to Subsurface/Source/Game1.cs
index be882f75e..1b0dea347 100644
--- a/Subsurface/Game1.cs
+++ b/Subsurface/Source/Game1.cs
@@ -297,6 +297,7 @@ namespace Subsurface
             {
                 Screen.Selected.Draw(deltaTime, GraphicsDevice, spriteBatch);
             }
+
             //renderTimeElapsed = (int)renderTimer.Elapsed.Ticks;
             //renderTimer.Stop();
             if (sw.Elapsed.TotalSeconds < Physics.step)
diff --git a/Subsurface/GameSession/CargoManager.cs b/Subsurface/Source/GameSession/CargoManager.cs
similarity index 100%
rename from Subsurface/GameSession/CargoManager.cs
rename to Subsurface/Source/GameSession/CargoManager.cs
diff --git a/Subsurface/GameSession/CrewManager.cs b/Subsurface/Source/GameSession/CrewManager.cs
similarity index 100%
rename from Subsurface/GameSession/CrewManager.cs
rename to Subsurface/Source/GameSession/CrewManager.cs
diff --git a/Subsurface/GameSession/GameMode.cs b/Subsurface/Source/GameSession/GameMode.cs
similarity index 100%
rename from Subsurface/GameSession/GameMode.cs
rename to Subsurface/Source/GameSession/GameMode.cs
diff --git a/Subsurface/GameSession/GameSession.cs b/Subsurface/Source/GameSession/GameSession.cs
similarity index 86%
rename from Subsurface/GameSession/GameSession.cs
rename to Subsurface/Source/GameSession/GameSession.cs
index 51fbb53c9..fc3e13e4a 100644
--- a/Subsurface/GameSession/GameSession.cs
+++ b/Subsurface/Source/GameSession/GameSession.cs
@@ -25,7 +25,7 @@ namespace Subsurface
         //private GUIListBox chatBox;
         //private GUITextBox textBox;
 
-        private string savePath;
+        private string saveFile;
 
         private Submarine submarine;
 
@@ -60,22 +60,22 @@ namespace Subsurface
             get { return submarine; }
         }
 
-        public string SavePath
+        public string SaveFile
         {
-            get { return savePath; }
+            get { return saveFile; }
         }
 
-        public GameSession(Submarine submarine, GameModePreset gameModePreset)
-            :this(submarine, gameModePreset.Instantiate())
+        public GameSession(Submarine submarine, string saveFile, GameModePreset gameModePreset)
+            :this(submarine, saveFile, gameModePreset.Instantiate())
         {
 
         }
 
-        public GameSession(Submarine selectedSub, GameMode gameMode = null)
+        public GameSession(Submarine selectedSub, string saveFile, GameMode gameMode = null)
         {
             taskManager = new TaskManager(this);
 
-            savePath = SaveUtil.CreateSavePath(SaveUtil.SaveFolder);
+            this.saveFile = saveFile;
 
             guiRoot = new GUIFrame(new Rectangle(0,0,Game1.GraphicsWidth,Game1.GraphicsWidth), Color.Transparent);
 
@@ -84,8 +84,8 @@ namespace Subsurface
           
         }
 
-        public GameSession(Submarine selectedSub, string savePath, string filePath)
-            : this(selectedSub)
+        public GameSession(Submarine selectedSub, string saveFile, string filePath)
+            : this(selectedSub, saveFile)
         {
             XDocument doc = ToolBox.TryLoadXml(filePath);
             if (doc == null) return;
@@ -96,8 +96,6 @@ namespace Subsurface
 
                 gameMode = new SinglePlayerMode(subElement);
             }
-
-            this.savePath = savePath;
         }
 
         public void StartShift(TimeSpan duration, string levelSeed)
@@ -130,7 +128,6 @@ namespace Subsurface
 
         public void EndShift(string endMessage)
         {
-
             if (Quest != null) Quest.End();
 
             if (Game1.Server!=null)
@@ -159,7 +156,7 @@ namespace Subsurface
 
         public bool LoadPrevious(GUIButton button, object obj)
         {
-            SaveUtil.LoadGame(savePath);
+            SaveUtil.LoadGame(saveFile);
 
             Game1.LobbyScreen.Select();
 
@@ -188,6 +185,9 @@ namespace Subsurface
             XDocument doc = new XDocument(
                 new XElement((XName)"Gamesession"));
 
+            var now = DateTime.Now;
+            doc.Root.Add(new XAttribute("savetime", now.Hour + ":" + now.Minute + ", " + now.ToShortDateString()));
+
             ((SinglePlayerMode)gameMode).Save(doc.Root);
 
             try
diff --git a/Subsurface/GameSession/HireManager.cs b/Subsurface/Source/GameSession/HireManager.cs
similarity index 100%
rename from Subsurface/GameSession/HireManager.cs
rename to Subsurface/Source/GameSession/HireManager.cs
diff --git a/Subsurface/GameSession/QuestMode.cs b/Subsurface/Source/GameSession/QuestMode.cs
similarity index 100%
rename from Subsurface/GameSession/QuestMode.cs
rename to Subsurface/Source/GameSession/QuestMode.cs
diff --git a/Subsurface/GameSession/SinglePlayerMode.cs b/Subsurface/Source/GameSession/SinglePlayerMode.cs
similarity index 95%
rename from Subsurface/GameSession/SinglePlayerMode.cs
rename to Subsurface/Source/GameSession/SinglePlayerMode.cs
index 8e7e90696..09e1dcbf0 100644
--- a/Subsurface/GameSession/SinglePlayerMode.cs
+++ b/Subsurface/Source/GameSession/SinglePlayerMode.cs
@@ -101,7 +101,7 @@ namespace Subsurface
 
             if (!savedOnStart)
             {
-                SaveUtil.SaveGame(Game1.GameSession.SavePath);
+                SaveUtil.SaveGame(Game1.GameSession.SaveFile);
                 savedOnStart = true;
             }
 
@@ -178,7 +178,11 @@ namespace Subsurface
 
         public override void End(string endMessage = "")
         {
-            base.End(endMessage);
+
+            isRunning = false;
+
+            //if (endMessage != "" || this.endMessage == null) this.endMessage = endMessage;
+
 
             StringBuilder sb = new StringBuilder();
             List<Character> casualties = crewManager.characters.FindAll(c => c.IsDead);
@@ -187,7 +191,7 @@ namespace Subsurface
             {
                 sb.Append("Your entire crew has died!");
 
-                var msgBox = new GUIMessageBox("GG", sb.ToString(), new string[] { "Load game", "Quit" });
+                var msgBox = new GUIMessageBox("", sb.ToString(), new string[] { "Load game", "Quit" });
                 msgBox.Buttons[0].OnClicked += Game1.GameSession.LoadPrevious;
                 msgBox.Buttons[0].OnClicked += msgBox.Close;
                 msgBox.Buttons[1].OnClicked = Game1.LobbyScreen.QuitToMainMenu;
@@ -213,7 +217,7 @@ namespace Subsurface
                     map.MoveToNextLocation();
                 }
 
-                SaveUtil.SaveGame(Game1.GameSession.SavePath);
+                SaveUtil.SaveGame(Game1.GameSession.SaveFile);
             }
 
             crewManager.EndShift();
diff --git a/Subsurface/GameSession/TraitorMode.cs b/Subsurface/Source/GameSession/TraitorMode.cs
similarity index 100%
rename from Subsurface/GameSession/TraitorMode.cs
rename to Subsurface/Source/GameSession/TraitorMode.cs
diff --git a/Subsurface/GameSettings.cs b/Subsurface/Source/GameSettings.cs
similarity index 100%
rename from Subsurface/GameSettings.cs
rename to Subsurface/Source/GameSettings.cs
diff --git a/Subsurface/IPropertyObject.cs b/Subsurface/Source/IPropertyObject.cs
similarity index 100%
rename from Subsurface/IPropertyObject.cs
rename to Subsurface/Source/IPropertyObject.cs
diff --git a/Subsurface/Items/CharacterInventory.cs b/Subsurface/Source/Items/CharacterInventory.cs
similarity index 100%
rename from Subsurface/Items/CharacterInventory.cs
rename to Subsurface/Source/Items/CharacterInventory.cs
diff --git a/Subsurface/Items/Components/Container.cs b/Subsurface/Source/Items/Components/Container.cs
similarity index 100%
rename from Subsurface/Items/Components/Container.cs
rename to Subsurface/Source/Items/Components/Container.cs
diff --git a/Subsurface/Items/Components/Door.cs b/Subsurface/Source/Items/Components/Door.cs
similarity index 96%
rename from Subsurface/Items/Components/Door.cs
rename to Subsurface/Source/Items/Components/Door.cs
index d26ab9113..3558efb76 100644
--- a/Subsurface/Items/Components/Door.cs
+++ b/Subsurface/Source/Items/Components/Door.cs
@@ -1,325 +1,325 @@
-using System;
-using System.IO;
-using System.Xml.Linq;
-using FarseerPhysics;
-using FarseerPhysics.Dynamics;
-using FarseerPhysics.Factories;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Subsurface.Lights;
-
-namespace Subsurface.Items.Components
-{
-    class Door : ItemComponent
-    {
-        Gap linkedGap;
-
-        Rectangle window;
-
-        ConvexHull convexHull;
-        ConvexHull convexHull2;
-
-        private float stuck;
-        public float Stuck
-        {
-            get { return stuck; }
-            set 
-            {
-                if (isOpen) return;
-                stuck = MathHelper.Clamp(value, 0.0f, 100.0f);
-                if (stuck == 0.0f) isStuck = false;
-                if (stuck == 100.0f) isStuck = true;
-            }
-        }
-
-        private bool isStuck;
-
-        Gap LinkedGap
-        {
-            get
-            {
-                if (linkedGap != null) return linkedGap;
-                foreach (MapEntity e in item.linkedTo)
-                {
-                    linkedGap = e as Gap;
-                    if (linkedGap != null) return linkedGap;
-                }
-                linkedGap = new Gap(item.Rect);
-                linkedGap.Open = openState;
-                item.linkedTo.Add(linkedGap);
-                return linkedGap;
-            }
-        }
-        
-        bool isOpen;
-        
-        float openState;
-
-        [HasDefaultValue("0.0,0.0,0.0,0.0", false)]
-        public string Window
-        {
-            get { return ToolBox.Vector4ToString(new Vector4(window.X, window.Y, window.Width, window.Height)); }
-            set
-            {
-                Vector4 vector = ToolBox.ParseToVector4(value);
-                if (vector.Z!=0.0f || vector.W !=0.0f)
-                {
-                    window = new Rectangle((int)vector.X, (int)vector.Y, (int)vector.Z, (int)vector.W);
-                }
-            }
-        }
-
-        [Editable, HasDefaultValue(false, true)]
-        public bool IsOpen
-        {
-            get { return isOpen; }
-            set 
-            {
-                isOpen = value;
-                OpenState = (isOpen) ? 1.0f : 0.0f;
-            }
-        }
-
-        private Rectangle doorRect;
-                
-        public float OpenState
-        {
-            get { return openState; }
-            set 
-            {
-                
-                float prevValue = openState;
-                openState = MathHelper.Clamp(value, 0.0f, 1.0f);
-                if (openState == prevValue) return;
-
-                UpdateConvexHulls();
-            }
-        }
-
-        PhysicsBody body;
-
-        Sprite doorSprite;
-        
-        public Door(Item item, XElement element)
-            : base(item, element)
-        {
-            //Vector2 position = new Vector2(newRect.X, newRect.Y);
-            
-           // isOpen = false;
-            foreach (XElement subElement in element.Elements())
-            {
-                if (subElement.Name.ToString().ToLower() != "sprite") continue;
-                doorSprite = new Sprite(subElement, Path.GetDirectoryName(item.Prefab.ConfigFile));
-                break;
-            }
-
-            doorRect = new Rectangle(
-                item.Rect.Center.X - (int)(doorSprite.size.X / 2),
-                item.Rect.Y,
-                (int)doorSprite.size.X,
-                (int)doorSprite.size.Y);
-
-
-            body = new PhysicsBody(BodyFactory.CreateRectangle(Game1.World,
-                ConvertUnits.ToSimUnits(Math.Max(doorRect.Width, 1)),
-                ConvertUnits.ToSimUnits(Math.Max(doorRect.Height, 1)),
-                1.5f));
-
-            body.CollisionCategories = Physics.CollisionWall;
-            body.UserData = item;
-            body.BodyType = BodyType.Static;
-            body.SetTransform(
-                ConvertUnits.ToSimUnits(new Vector2(doorRect.Center.X, doorRect.Y - doorRect.Height / 2)),
-                0.0f);
-            body.Friction = 0.5f;
-
-
-            //string spritePath = Path.GetDirectoryName(item.Prefab.ConfigFile) + "\\"+ ToolBox.GetAttributeString(element, "sprite", "");
-            
-            Vector2[] corners = GetConvexHullCorners(doorRect);
-
-            convexHull = new ConvexHull(corners, Color.Black);            
-            if (window!=Rectangle.Empty) convexHull2 = new ConvexHull(corners, Color.Black);
-
-            UpdateConvexHulls();
-
-            isActive = true;
-        }
-
-        private void UpdateConvexHulls()
-        {
-            Rectangle rect = doorRect;
-
-            rect.Height = (int)(rect.Height * (1.0f - openState));
-            if (window.Height == 0 || window.Width == 0)
-            {
-
-            }
-            else
-            {
-                //Rectangle rect = item.Rect;
-                //rect.Height = (int)(rect.Height * (1.0f - openState));
-
-                rect.Height = -window.Y;
-
-                rect.Y += (int)(doorRect.Height * openState);
-                rect.Height = Math.Max(rect.Height - (rect.Y - doorRect.Y), 0);
-                rect.Y = Math.Min(doorRect.Y, rect.Y);
-
-
-                if (convexHull2 != null)
-                {
-                    Rectangle rect2 = doorRect;
-                    rect2.Y = rect2.Y + window.Y - window.Height;
-
-                    rect2.Y += (int)(doorRect.Height * openState);
-                    rect2.Y = Math.Min(doorRect.Y, rect2.Y);
-                    rect2.Height = rect2.Y - (doorRect.Y - (int)(doorRect.Height * (1.0f - openState)));
-                    //convexHull2.SetVertices(GetConvexHullCorners(rect2));
-
-                    if (rect2.Height == 0)
-                    {
-                        convexHull2.Enabled = false;
-                    }
-                    else
-                    {
-                        convexHull2.Enabled = true;
-                        convexHull2.SetVertices(GetConvexHullCorners(rect2));
-                    }
-                }
-            }
-
-            if (rect.Height == 0)
-            {
-                convexHull.Enabled = false;
-            }
-            else
-            {
-                convexHull.Enabled = true;
-                convexHull.SetVertices(GetConvexHullCorners(rect));
-            }
-        }
-
-        private Vector2[] GetConvexHullCorners(Rectangle rect)
-        {
-            Vector2[] corners = new Vector2[4];
-            corners[0] = new Vector2(rect.X, rect.Y - rect.Height);
-            corners[1] = new Vector2(rect.X, rect.Y);
-            corners[2] = new Vector2(rect.Right, rect.Y);
-            corners[3] = new Vector2(rect.Right, rect.Y - rect.Height);
-
-            return corners;
-        }
-
-        public override void Move(Vector2 amount)
-        {
-            base.Move(amount);
-
-            //LinkedGap.Move(amount);
-
-            body.SetTransform(body.Position + ConvertUnits.ToSimUnits(amount), 0.0f);
-
-            convexHull.Move(amount);
-            if (convexHull2 != null) convexHull2.Move(amount);
-        }
-
-
-        public override bool Pick(Character picker)
-        {
-            isOpen = !isOpen;
-
-            return true;
-        }
-
-        public override void Update(float deltaTime, Camera cam)
-        {
-            if (!isStuck)
-            {
-                OpenState += deltaTime * ((isOpen) ? 3.0f : -3.0f);
-                LinkedGap.Open = openState;
-            }
-
-            
-            item.SendSignal((isOpen) ? "1" : "0", "state_out");
-        }
-
-        public override void UpdateBroken(float deltaTime, Camera cam)
-        {
-            body.Enabled = false;
-            convexHull.Enabled = false;
-            linkedGap.Open = 1.0f;
-            if (convexHull2 != null) convexHull2.Enabled = false;
-        }
-
-        public override void Draw(SpriteBatch spriteBatch, bool editing)
-        {           
-            Color color = (item.IsSelected) ? Color.Green : Color.White;
-            color = color * (item.Condition / 100.0f);
-            color.A = 255;
-
-            //prefab.sprite.Draw(spriteBatch, new Vector2(rect.X, -rect.Y), new Vector2(rect.Width, rect.Height), color);
-
-            if (openState == 1.0f)
-            {
-                body.Enabled = false;
-            }
-            else
-            {
-                spriteBatch.Draw(doorSprite.Texture, new Vector2(item.Rect.Center.X, -item.Rect.Y),
-                    new Rectangle(doorSprite.SourceRect.X, (int)(doorSprite.size.Y * openState),
-                    (int)doorSprite.size.X, (int)(doorSprite.size.Y * (1.0f - openState))),
-                    color, 0.0f, doorSprite.Origin, 1.0f, SpriteEffects.None, doorSprite.Depth);
-
-                if (openState == 0.0f)
-                {
-                    body.Enabled = true;
-                }
-                else
-                {
-                    //push characters out of the doorway when the door is closing/opening
-                    Vector2 simPos = ConvertUnits.ToSimUnits(new Vector2(item.Rect.X, item.Rect.Y));
-                    Vector2 simSize = ConvertUnits.ToSimUnits(new Vector2(item.Rect.Width,
-                    item.Rect.Height * (1.0f - openState)));
-
-                    foreach (Character c in Character.CharacterList)
-                    {
-                        int dir = Math.Sign(c.AnimController.limbs[0].SimPosition.X - simPos.X);
-                        foreach (Limb l in c.AnimController.limbs)
-                        {
-                            if (l.SimPosition.Y < simPos.Y || l.SimPosition.Y > simPos.Y - simSize.Y) continue;
-                            if (Math.Abs(l.SimPosition.X - simPos.X) > simSize.X * 2.0f) continue;
-
-                            l.body.ApplyForce(new Vector2(dir * 10.0f, 0.0f));
-                        }
-                    }
-                }
-            }
-        }
-
-        public override void Remove()
-        {
-            base.Remove();
-
-            Game1.World.RemoveBody(body.FarseerBody);
-
-            if (linkedGap!=null) linkedGap.Remove();
-
-            doorSprite.Remove();
-
-            convexHull.Remove();
-            if (convexHull2 != null) convexHull2.Remove();
-        }
-
-        public override void ReceiveSignal(string signal, Connection connection, Item sender, float power=0.0f)
-        {
-            if (connection.Name=="toggle")
-            {
-                isOpen = !isOpen;
-            }
-            else if (connection.Name == "set_state")
-            {
-                isOpen = (signal!="0");                
-            }            
-        }
-    }
-}
+using System;
+using System.IO;
+using System.Xml.Linq;
+using FarseerPhysics;
+using FarseerPhysics.Dynamics;
+using FarseerPhysics.Factories;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Subsurface.Lights;
+
+namespace Subsurface.Items.Components
+{
+    class Door : ItemComponent
+    {
+        Gap linkedGap;
+
+        Rectangle window;
+
+        ConvexHull convexHull;
+        ConvexHull convexHull2;
+
+        private float stuck;
+        public float Stuck
+        {
+            get { return stuck; }
+            set 
+            {
+                if (isOpen) return;
+                stuck = MathHelper.Clamp(value, 0.0f, 100.0f);
+                if (stuck == 0.0f) isStuck = false;
+                if (stuck == 100.0f) isStuck = true;
+            }
+        }
+
+        private bool isStuck;
+
+        Gap LinkedGap
+        {
+            get
+            {
+                if (linkedGap != null) return linkedGap;
+                foreach (MapEntity e in item.linkedTo)
+                {
+                    linkedGap = e as Gap;
+                    if (linkedGap != null) return linkedGap;
+                }
+                linkedGap = new Gap(item.Rect);
+                linkedGap.Open = openState;
+                item.linkedTo.Add(linkedGap);
+                return linkedGap;
+            }
+        }
+        
+        bool isOpen;
+        
+        float openState;
+
+        [HasDefaultValue("0.0,0.0,0.0,0.0", false)]
+        public string Window
+        {
+            get { return ToolBox.Vector4ToString(new Vector4(window.X, window.Y, window.Width, window.Height)); }
+            set
+            {
+                Vector4 vector = ToolBox.ParseToVector4(value);
+                if (vector.Z!=0.0f || vector.W !=0.0f)
+                {
+                    window = new Rectangle((int)vector.X, (int)vector.Y, (int)vector.Z, (int)vector.W);
+                }
+            }
+        }
+
+        [Editable, HasDefaultValue(false, true)]
+        public bool IsOpen
+        {
+            get { return isOpen; }
+            set 
+            {
+                isOpen = value;
+                OpenState = (isOpen) ? 1.0f : 0.0f;
+            }
+        }
+
+        private Rectangle doorRect;
+                
+        public float OpenState
+        {
+            get { return openState; }
+            set 
+            {
+                
+                float prevValue = openState;
+                openState = MathHelper.Clamp(value, 0.0f, 1.0f);
+                if (openState == prevValue) return;
+
+                UpdateConvexHulls();
+            }
+        }
+
+        PhysicsBody body;
+
+        Sprite doorSprite;
+        
+        public Door(Item item, XElement element)
+            : base(item, element)
+        {
+            //Vector2 position = new Vector2(newRect.X, newRect.Y);
+            
+           // isOpen = false;
+            foreach (XElement subElement in element.Elements())
+            {
+                if (subElement.Name.ToString().ToLower() != "sprite") continue;
+                doorSprite = new Sprite(subElement, Path.GetDirectoryName(item.Prefab.ConfigFile));
+                break;
+            }
+
+            doorRect = new Rectangle(
+                item.Rect.Center.X - (int)(doorSprite.size.X / 2),
+                item.Rect.Y,
+                (int)doorSprite.size.X,
+                (int)doorSprite.size.Y);
+
+
+            body = new PhysicsBody(BodyFactory.CreateRectangle(Game1.World,
+                ConvertUnits.ToSimUnits(Math.Max(doorRect.Width, 1)),
+                ConvertUnits.ToSimUnits(Math.Max(doorRect.Height, 1)),
+                1.5f));
+
+            body.CollisionCategories = Physics.CollisionWall;
+            body.UserData = item;
+            body.BodyType = BodyType.Static;
+            body.SetTransform(
+                ConvertUnits.ToSimUnits(new Vector2(doorRect.Center.X, doorRect.Y - doorRect.Height / 2)),
+                0.0f);
+            body.Friction = 0.5f;
+
+
+            //string spritePath = Path.GetDirectoryName(item.Prefab.ConfigFile) + "\\"+ ToolBox.GetAttributeString(element, "sprite", "");
+            
+            Vector2[] corners = GetConvexHullCorners(doorRect);
+
+            convexHull = new ConvexHull(corners, Color.Black);            
+            if (window!=Rectangle.Empty) convexHull2 = new ConvexHull(corners, Color.Black);
+
+            UpdateConvexHulls();
+
+            isActive = true;
+        }
+
+        private void UpdateConvexHulls()
+        {
+            Rectangle rect = doorRect;
+
+            rect.Height = (int)(rect.Height * (1.0f - openState));
+            if (window.Height == 0 || window.Width == 0)
+            {
+
+            }
+            else
+            {
+                //Rectangle rect = item.Rect;
+                //rect.Height = (int)(rect.Height * (1.0f - openState));
+
+                rect.Height = -window.Y;
+
+                rect.Y += (int)(doorRect.Height * openState);
+                rect.Height = Math.Max(rect.Height - (rect.Y - doorRect.Y), 0);
+                rect.Y = Math.Min(doorRect.Y, rect.Y);
+
+
+                if (convexHull2 != null)
+                {
+                    Rectangle rect2 = doorRect;
+                    rect2.Y = rect2.Y + window.Y - window.Height;
+
+                    rect2.Y += (int)(doorRect.Height * openState);
+                    rect2.Y = Math.Min(doorRect.Y, rect2.Y);
+                    rect2.Height = rect2.Y - (doorRect.Y - (int)(doorRect.Height * (1.0f - openState)));
+                    //convexHull2.SetVertices(GetConvexHullCorners(rect2));
+
+                    if (rect2.Height == 0)
+                    {
+                        convexHull2.Enabled = false;
+                    }
+                    else
+                    {
+                        convexHull2.Enabled = true;
+                        convexHull2.SetVertices(GetConvexHullCorners(rect2));
+                    }
+                }
+            }
+
+            if (rect.Height == 0)
+            {
+                convexHull.Enabled = false;
+            }
+            else
+            {
+                convexHull.Enabled = true;
+                convexHull.SetVertices(GetConvexHullCorners(rect));
+            }
+        }
+
+        private Vector2[] GetConvexHullCorners(Rectangle rect)
+        {
+            Vector2[] corners = new Vector2[4];
+            corners[0] = new Vector2(rect.X, rect.Y - rect.Height);
+            corners[1] = new Vector2(rect.X, rect.Y);
+            corners[2] = new Vector2(rect.Right, rect.Y);
+            corners[3] = new Vector2(rect.Right, rect.Y - rect.Height);
+
+            return corners;
+        }
+
+        public override void Move(Vector2 amount)
+        {
+            base.Move(amount);
+
+            //LinkedGap.Move(amount);
+
+            body.SetTransform(body.Position + ConvertUnits.ToSimUnits(amount), 0.0f);
+
+            convexHull.Move(amount);
+            if (convexHull2 != null) convexHull2.Move(amount);
+        }
+
+
+        public override bool Pick(Character picker)
+        {
+            isOpen = !isOpen;
+
+            return true;
+        }
+
+        public override void Update(float deltaTime, Camera cam)
+        {
+            if (!isStuck)
+            {
+                OpenState += deltaTime * ((isOpen) ? 3.0f : -3.0f);
+                LinkedGap.Open = openState;
+            }
+
+            
+            item.SendSignal((isOpen) ? "1" : "0", "state_out");
+        }
+
+        public override void UpdateBroken(float deltaTime, Camera cam)
+        {
+            body.Enabled = false;
+            convexHull.Enabled = false;
+            linkedGap.Open = 1.0f;
+            if (convexHull2 != null) convexHull2.Enabled = false;
+        }
+
+        public override void Draw(SpriteBatch spriteBatch, bool editing)
+        {           
+            Color color = (item.IsSelected) ? Color.Green : Color.White;
+            color = color * (item.Condition / 100.0f);
+            color.A = 255;
+
+            //prefab.sprite.Draw(spriteBatch, new Vector2(rect.X, -rect.Y), new Vector2(rect.Width, rect.Height), color);
+
+            if (openState == 1.0f)
+            {
+                body.Enabled = false;
+            }
+            else
+            {
+                spriteBatch.Draw(doorSprite.Texture, new Vector2(item.Rect.Center.X, -item.Rect.Y),
+                    new Rectangle(doorSprite.SourceRect.X, (int)(doorSprite.size.Y * openState),
+                    (int)doorSprite.size.X, (int)(doorSprite.size.Y * (1.0f - openState))),
+                    color, 0.0f, doorSprite.Origin, 1.0f, SpriteEffects.None, doorSprite.Depth);
+
+                if (openState == 0.0f)
+                {
+                    body.Enabled = true;
+                }
+                else
+                {
+                    //push characters out of the doorway when the door is closing/opening
+                    Vector2 simPos = ConvertUnits.ToSimUnits(new Vector2(item.Rect.X, item.Rect.Y));
+                    Vector2 simSize = ConvertUnits.ToSimUnits(new Vector2(item.Rect.Width,
+                    item.Rect.Height * (1.0f - openState)));
+
+                    foreach (Character c in Character.CharacterList)
+                    {
+                        int dir = Math.Sign(c.AnimController.limbs[0].SimPosition.X - simPos.X);
+                        foreach (Limb l in c.AnimController.limbs)
+                        {
+                            if (l.SimPosition.Y < simPos.Y || l.SimPosition.Y > simPos.Y - simSize.Y) continue;
+                            if (Math.Abs(l.SimPosition.X - simPos.X) > simSize.X * 2.0f) continue;
+
+                            l.body.ApplyForce(new Vector2(dir * 10.0f, 0.0f));
+                        }
+                    }
+                }
+            }
+        }
+
+        public override void Remove()
+        {
+            base.Remove();
+
+            Game1.World.RemoveBody(body.FarseerBody);
+
+            if (linkedGap!=null) linkedGap.Remove();
+
+            doorSprite.Remove();
+
+            convexHull.Remove();
+            if (convexHull2 != null) convexHull2.Remove();
+        }
+
+        public override void ReceiveSignal(string signal, Connection connection, Item sender, float power=0.0f)
+        {
+            if (connection.Name=="toggle")
+            {
+                isOpen = !isOpen;
+            }
+            else if (connection.Name == "set_state")
+            {
+                isOpen = (signal!="0");                
+            }            
+        }
+    }
+}
diff --git a/Subsurface/Items/Components/Holdable/Holdable.cs b/Subsurface/Source/Items/Components/Holdable/Holdable.cs
similarity index 100%
rename from Subsurface/Items/Components/Holdable/Holdable.cs
rename to Subsurface/Source/Items/Components/Holdable/Holdable.cs
diff --git a/Subsurface/Items/Components/Holdable/Pickable.cs b/Subsurface/Source/Items/Components/Holdable/Pickable.cs
similarity index 100%
rename from Subsurface/Items/Components/Holdable/Pickable.cs
rename to Subsurface/Source/Items/Components/Holdable/Pickable.cs
diff --git a/Subsurface/Items/Components/Holdable/RangedWeapon.cs b/Subsurface/Source/Items/Components/Holdable/RangedWeapon.cs
similarity index 100%
rename from Subsurface/Items/Components/Holdable/RangedWeapon.cs
rename to Subsurface/Source/Items/Components/Holdable/RangedWeapon.cs
diff --git a/Subsurface/Items/Components/Holdable/RepairTool.cs b/Subsurface/Source/Items/Components/Holdable/RepairTool.cs
similarity index 100%
rename from Subsurface/Items/Components/Holdable/RepairTool.cs
rename to Subsurface/Source/Items/Components/Holdable/RepairTool.cs
diff --git a/Subsurface/Items/Components/Holdable/Throwable.cs b/Subsurface/Source/Items/Components/Holdable/Throwable.cs
similarity index 100%
rename from Subsurface/Items/Components/Holdable/Throwable.cs
rename to Subsurface/Source/Items/Components/Holdable/Throwable.cs
diff --git a/Subsurface/Items/Components/ItemComponent.cs b/Subsurface/Source/Items/Components/ItemComponent.cs
similarity index 100%
rename from Subsurface/Items/Components/ItemComponent.cs
rename to Subsurface/Source/Items/Components/ItemComponent.cs
diff --git a/Subsurface/Items/Components/Label.cs b/Subsurface/Source/Items/Components/Label.cs
similarity index 100%
rename from Subsurface/Items/Components/Label.cs
rename to Subsurface/Source/Items/Components/Label.cs
diff --git a/Subsurface/Items/Components/Ladder.cs b/Subsurface/Source/Items/Components/Ladder.cs
similarity index 100%
rename from Subsurface/Items/Components/Ladder.cs
rename to Subsurface/Source/Items/Components/Ladder.cs
diff --git a/Subsurface/Items/Components/Machines/Controller.cs b/Subsurface/Source/Items/Components/Machines/Controller.cs
similarity index 100%
rename from Subsurface/Items/Components/Machines/Controller.cs
rename to Subsurface/Source/Items/Components/Machines/Controller.cs
diff --git a/Subsurface/Items/Components/Machines/Engine.cs b/Subsurface/Source/Items/Components/Machines/Engine.cs
similarity index 100%
rename from Subsurface/Items/Components/Machines/Engine.cs
rename to Subsurface/Source/Items/Components/Machines/Engine.cs
diff --git a/Subsurface/Items/Components/Machines/Fabricator.cs b/Subsurface/Source/Items/Components/Machines/Fabricator.cs
similarity index 100%
rename from Subsurface/Items/Components/Machines/Fabricator.cs
rename to Subsurface/Source/Items/Components/Machines/Fabricator.cs
diff --git a/Subsurface/Items/Components/Machines/MiniMap.cs b/Subsurface/Source/Items/Components/Machines/MiniMap.cs
similarity index 100%
rename from Subsurface/Items/Components/Machines/MiniMap.cs
rename to Subsurface/Source/Items/Components/Machines/MiniMap.cs
diff --git a/Subsurface/Items/Components/Machines/OxygenGenerator.cs b/Subsurface/Source/Items/Components/Machines/OxygenGenerator.cs
similarity index 100%
rename from Subsurface/Items/Components/Machines/OxygenGenerator.cs
rename to Subsurface/Source/Items/Components/Machines/OxygenGenerator.cs
diff --git a/Subsurface/Items/Components/Machines/Pump.cs b/Subsurface/Source/Items/Components/Machines/Pump.cs
similarity index 100%
rename from Subsurface/Items/Components/Machines/Pump.cs
rename to Subsurface/Source/Items/Components/Machines/Pump.cs
diff --git a/Subsurface/Items/Components/Machines/Radar.cs b/Subsurface/Source/Items/Components/Machines/Radar.cs
similarity index 100%
rename from Subsurface/Items/Components/Machines/Radar.cs
rename to Subsurface/Source/Items/Components/Machines/Radar.cs
diff --git a/Subsurface/Items/Components/Machines/Reactor.cs b/Subsurface/Source/Items/Components/Machines/Reactor.cs
similarity index 100%
rename from Subsurface/Items/Components/Machines/Reactor.cs
rename to Subsurface/Source/Items/Components/Machines/Reactor.cs
diff --git a/Subsurface/Items/Components/Machines/Steering.cs b/Subsurface/Source/Items/Components/Machines/Steering.cs
similarity index 100%
rename from Subsurface/Items/Components/Machines/Steering.cs
rename to Subsurface/Source/Items/Components/Machines/Steering.cs
diff --git a/Subsurface/Items/Components/Machines/Vent.cs b/Subsurface/Source/Items/Components/Machines/Vent.cs
similarity index 100%
rename from Subsurface/Items/Components/Machines/Vent.cs
rename to Subsurface/Source/Items/Components/Machines/Vent.cs
diff --git a/Subsurface/Items/Components/Power/PowerContainer.cs b/Subsurface/Source/Items/Components/Power/PowerContainer.cs
similarity index 100%
rename from Subsurface/Items/Components/Power/PowerContainer.cs
rename to Subsurface/Source/Items/Components/Power/PowerContainer.cs
diff --git a/Subsurface/Items/Components/Power/PowerTransfer.cs b/Subsurface/Source/Items/Components/Power/PowerTransfer.cs
similarity index 100%
rename from Subsurface/Items/Components/Power/PowerTransfer.cs
rename to Subsurface/Source/Items/Components/Power/PowerTransfer.cs
diff --git a/Subsurface/Items/Components/Power/Powered.cs b/Subsurface/Source/Items/Components/Power/Powered.cs
similarity index 100%
rename from Subsurface/Items/Components/Power/Powered.cs
rename to Subsurface/Source/Items/Components/Power/Powered.cs
diff --git a/Subsurface/Items/Components/Projectile.cs b/Subsurface/Source/Items/Components/Projectile.cs
similarity index 100%
rename from Subsurface/Items/Components/Projectile.cs
rename to Subsurface/Source/Items/Components/Projectile.cs
diff --git a/Subsurface/Items/Components/Rope.cs b/Subsurface/Source/Items/Components/Rope.cs
similarity index 100%
rename from Subsurface/Items/Components/Rope.cs
rename to Subsurface/Source/Items/Components/Rope.cs
diff --git a/Subsurface/Items/Components/Signal/AndComponent.cs b/Subsurface/Source/Items/Components/Signal/AndComponent.cs
similarity index 100%
rename from Subsurface/Items/Components/Signal/AndComponent.cs
rename to Subsurface/Source/Items/Components/Signal/AndComponent.cs
diff --git a/Subsurface/Items/Components/Signal/Connection.cs b/Subsurface/Source/Items/Components/Signal/Connection.cs
similarity index 99%
rename from Subsurface/Items/Components/Signal/Connection.cs
rename to Subsurface/Source/Items/Components/Signal/Connection.cs
index 234f86d50..9e3734ccd 100644
--- a/Subsurface/Items/Components/Signal/Connection.cs
+++ b/Subsurface/Source/Items/Components/Signal/Connection.cs
@@ -372,7 +372,7 @@ namespace Subsurface.Items.Components
             }
             else
             {
-                Vector2 pos = new Vector2(start.X, end.Y + wireCorner.size.Y) - wireVertical.size / 2;
+                Vector2 pos = new Vector2(start.X, end.Y + wireCorner.size.Y+1) - wireVertical.size / 2;
                 Vector2 size = new Vector2(wireVertical.size.X, (float)Math.Abs((end.Y + wireCorner.size.Y) - start.Y));
                 wireVertical.DrawTiled(spriteBatch, pos, size, wireItem.Color * alpha);
 
@@ -382,7 +382,7 @@ namespace Subsurface.Items.Components
                 float dir = (end.X > start.X) ? -1.0f : 1.0f;
 
                 wireCorner.Draw(spriteBatch,
-                    new Vector2(start.X, end.Y), wireItem.Color * alpha, 0.0f, 1.0f,
+                    new Vector2(start.X, end.Y-1), wireItem.Color * alpha, 0.0f, 1.0f,
                     (end.X > start.X) ? SpriteEffects.None : SpriteEffects.FlipHorizontally);
 
                 float wireStartX = start.X - wireCorner.size.X / 2 * dir;
diff --git a/Subsurface/Items/Components/Signal/ConnectionPanel.cs b/Subsurface/Source/Items/Components/Signal/ConnectionPanel.cs
similarity index 100%
rename from Subsurface/Items/Components/Signal/ConnectionPanel.cs
rename to Subsurface/Source/Items/Components/Signal/ConnectionPanel.cs
diff --git a/Subsurface/Items/Components/Signal/LightComponent.cs b/Subsurface/Source/Items/Components/Signal/LightComponent.cs
similarity index 100%
rename from Subsurface/Items/Components/Signal/LightComponent.cs
rename to Subsurface/Source/Items/Components/Signal/LightComponent.cs
diff --git a/Subsurface/Items/Components/Signal/NotComponent.cs b/Subsurface/Source/Items/Components/Signal/NotComponent.cs
similarity index 100%
rename from Subsurface/Items/Components/Signal/NotComponent.cs
rename to Subsurface/Source/Items/Components/Signal/NotComponent.cs
diff --git a/Subsurface/Items/Components/Signal/OrComponent.cs b/Subsurface/Source/Items/Components/Signal/OrComponent.cs
similarity index 100%
rename from Subsurface/Items/Components/Signal/OrComponent.cs
rename to Subsurface/Source/Items/Components/Signal/OrComponent.cs
diff --git a/Subsurface/Items/Components/Signal/OxygenDetector.cs b/Subsurface/Source/Items/Components/Signal/OxygenDetector.cs
similarity index 100%
rename from Subsurface/Items/Components/Signal/OxygenDetector.cs
rename to Subsurface/Source/Items/Components/Signal/OxygenDetector.cs
diff --git a/Subsurface/Items/Components/Signal/RegExFindComponent.cs b/Subsurface/Source/Items/Components/Signal/RegExFindComponent.cs
similarity index 100%
rename from Subsurface/Items/Components/Signal/RegExFindComponent.cs
rename to Subsurface/Source/Items/Components/Signal/RegExFindComponent.cs
diff --git a/Subsurface/Items/Components/Signal/SignalCheckComponent.cs b/Subsurface/Source/Items/Components/Signal/SignalCheckComponent.cs
similarity index 100%
rename from Subsurface/Items/Components/Signal/SignalCheckComponent.cs
rename to Subsurface/Source/Items/Components/Signal/SignalCheckComponent.cs
diff --git a/Subsurface/Items/Components/Signal/Wire.cs b/Subsurface/Source/Items/Components/Signal/Wire.cs
similarity index 100%
rename from Subsurface/Items/Components/Signal/Wire.cs
rename to Subsurface/Source/Items/Components/Signal/Wire.cs
diff --git a/Subsurface/Items/Components/Turret.cs b/Subsurface/Source/Items/Components/Turret.cs
similarity index 100%
rename from Subsurface/Items/Components/Turret.cs
rename to Subsurface/Source/Items/Components/Turret.cs
diff --git a/Subsurface/Items/Components/Wearable.cs b/Subsurface/Source/Items/Components/Wearable.cs
similarity index 100%
rename from Subsurface/Items/Components/Wearable.cs
rename to Subsurface/Source/Items/Components/Wearable.cs
diff --git a/Subsurface/Items/FixRequirement.cs b/Subsurface/Source/Items/FixRequirement.cs
similarity index 100%
rename from Subsurface/Items/FixRequirement.cs
rename to Subsurface/Source/Items/FixRequirement.cs
diff --git a/Subsurface/Items/Inventory.cs b/Subsurface/Source/Items/Inventory.cs
similarity index 100%
rename from Subsurface/Items/Inventory.cs
rename to Subsurface/Source/Items/Inventory.cs
diff --git a/Subsurface/Items/Item.cs b/Subsurface/Source/Items/Item.cs
similarity index 99%
rename from Subsurface/Items/Item.cs
rename to Subsurface/Source/Items/Item.cs
index 6474c6bb4..8b705094b 100644
--- a/Subsurface/Items/Item.cs
+++ b/Subsurface/Source/Items/Item.cs
@@ -11,6 +11,7 @@ using System;
 using Subsurface.Items.Components;
 using System.ComponentModel;
 using System.Collections.ObjectModel;
+using FarseerPhysics.Dynamics;
 
 namespace Subsurface
 {
@@ -178,7 +179,7 @@ namespace Subsurface
 
         public override string ToString()
         {
-            return Name +"("+ID+")";
+            return (Game1.DebugDraw) ? Name +"(ID: "+ID+")" : Name;
         }
 
         public List<IPropertyObject> AllPropertyObjects
@@ -737,7 +738,8 @@ namespace Subsurface
                 if (item.prefab.PickDistance == 0.0f) continue;  
                 if (Vector2.Distance(position, item.SimPosition) > item.prefab.PickDistance) continue;
 
-                if (Submarine.CheckVisibility(position, item.SimPosition)!=null) continue;
+                Body body = Submarine.CheckVisibility(position, item.SimPosition);
+                if (body != null && body.UserData as Item != item) continue;
 
                 dist = Vector2.Distance(pickPosition, item.SimPosition);
                 if ((closest == null || dist < closestDist))
diff --git a/Subsurface/Items/ItemInventory.cs b/Subsurface/Source/Items/ItemInventory.cs
similarity index 100%
rename from Subsurface/Items/ItemInventory.cs
rename to Subsurface/Source/Items/ItemInventory.cs
diff --git a/Subsurface/Items/ItemPrefab.cs b/Subsurface/Source/Items/ItemPrefab.cs
similarity index 97%
rename from Subsurface/Items/ItemPrefab.cs
rename to Subsurface/Source/Items/ItemPrefab.cs
index 87360fdb4..e13b087be 100644
--- a/Subsurface/Items/ItemPrefab.cs
+++ b/Subsurface/Source/Items/ItemPrefab.cs
@@ -1,190 +1,190 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.Linq;
-using FarseerPhysics;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Input;
-
-namespace Subsurface
-{
-    class ItemPrefab : MapEntityPrefab
-    {
-        //static string contentFolder = "Content/Items/";
-
-        string configFile;
-
-        //should the camera focus on the construction when selected
-        protected bool focusOnSelected;
-        //the amount of "camera offset" when selecting the construction
-        protected float offsetOnSelected;
-        //default size
-        protected Vector2 size;
-
-        //how close the character has to be to the item to pick it up
-        private float pickDistance;
-
-        //an area next to the construction
-        //the construction can be Activated() by a character inside the area
-        public List<Rectangle> Triggers;
-
-        public string ConfigFile
-        {
-            get { return configFile; }
-        }
-
-        public float PickDistance
-        {
-            get { return pickDistance; }
-        }
-
-
-        public override bool IsLinkable
-        {
-            get { return isLinkable; }
-        }
-
-        public bool FocusOnSelected
-        {
-            get { return focusOnSelected; }
-        }
-
-        public float OffsetOnSelected
-        {
-            get { return offsetOnSelected; }
-        }
-
-        public Vector2 Size
-        {
-            get { return size; }
-        }
-
-        public override void UpdatePlacing(SpriteBatch spriteBatch, Camera cam)
-        {
-            Vector2 position = Submarine.MouseToWorldGrid(cam); 
-            
-            if (!resizeHorizontal && !resizeVertical)
-            {
-                if (PlayerInput.LeftButtonClicked())
-                {
-                    new Item(new Rectangle((int)position.X, (int)position.Y, (int)sprite.size.X, (int)sprite.size.Y), this);
-                    //constructor.Invoke(lobject);
-
-                    placePosition = Vector2.Zero;
-
-                    selected = null;
-                    return;
-                }
-
-                sprite.Draw(spriteBatch, new Vector2(position.X + sprite.size.X / 2.0f, -position.Y + sprite.size.Y / 2.0f));
-            }
-            else
-            {
-                Vector2 placeSize = size;
-
-                if (placePosition == Vector2.Zero)
-                {
-                    if (PlayerInput.GetMouseState.LeftButton == ButtonState.Pressed)
-                        placePosition = position;
-                }
-                else
-                {
-                    if (resizeHorizontal)
-                        placeSize.X = Math.Max(position.X - placePosition.X, size.X);
-                    if (resizeVertical)
-                        placeSize.Y = Math.Max(placePosition.Y - position.Y, size.Y);
-
-                    if (PlayerInput.GetMouseState.LeftButton == ButtonState.Released)
-                    {
-                        new Item(new Rectangle((int)placePosition.X, (int)placePosition.Y, (int)placeSize.X, (int)placeSize.Y), this);
-                        
-                        selected = null;
-                        return;
-                    }
-
-                    position = placePosition;
-                }
-
-                sprite.DrawTiled(spriteBatch, new Vector2(position.X, -position.Y), placeSize, Color.White);
-            }
-            
-            if (PlayerInput.GetMouseState.RightButton == ButtonState.Pressed) selected = null;
-
-        }
-
-        public static void LoadAll(List<string> filePaths)
-        {
-            //string[] files = Directory.GetFiles(contentFolder, "*.xml", SearchOption.AllDirectories);
-
-            foreach (string filePath in filePaths)
-            {
-                XDocument doc = ToolBox.TryLoadXml(filePath);
-                if (doc == null) return;
-
-                if (doc.Root.Name.ToString().ToLower() == "item")
-                {
-                    new ItemPrefab(doc.Root, filePath);
-                }
-                else
-                {
-                    foreach (XElement element in doc.Root.Elements())
-                    {
-                        if (element.Name.ToString().ToLower() != "item") continue;
-
-                        new ItemPrefab(element, filePath);
-                    }
-                }
-            }
-        }
-
-        public ItemPrefab (XElement element, string filePath)
-        {
-
-            configFile = filePath;
-
-            name = ToolBox.GetAttributeString(element, "name", "");
-            if (name == "") DebugConsole.ThrowError("Unnamed item in "+filePath+"!");
-            
-            pickDistance = ConvertUnits.ToSimUnits(ToolBox.GetAttributeFloat(element, "pickdistance", 0.0f));
-            
-            isLinkable          = ToolBox.GetAttributeBool(element, "linkable", false);
-
-            resizeHorizontal    = ToolBox.GetAttributeBool(element, "resizehorizontal", false);
-            resizeVertical      = ToolBox.GetAttributeBool(element, "resizevertical", false);
-
-            focusOnSelected     = ToolBox.GetAttributeBool(element, "focusonselected", false);
-
-            offsetOnSelected    = ToolBox.GetAttributeFloat(element, "offsetonselected", 0.0f);
-
-            price = ToolBox.GetAttributeInt(element, "price", 0);
-            
-            Triggers            = new List<Rectangle>();
-
-            foreach (XElement subElement in element.Elements())
-            {
-                switch (subElement.Name.ToString().ToLower())
-                {
-                    case "sprite":
-                        sprite = new Sprite(subElement, Path.GetDirectoryName(filePath));
-                        size = sprite.size;
-                        break;
-                    case "trigger":
-                        Rectangle trigger = new Rectangle(0, 0, 10,10);
-
-                        trigger.X = ToolBox.GetAttributeInt(subElement, "x", 0);
-                        trigger.Y = ToolBox.GetAttributeInt(subElement, "y", 0);
-
-                        trigger.Width = ToolBox.GetAttributeInt(subElement, "width", 0);
-                        trigger.Height = ToolBox.GetAttributeInt(subElement, "height", 0);
-
-                        Triggers.Add(trigger);
-
-                        break;
-                }
-            }
-
-            list.Add(this);
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml.Linq;
+using FarseerPhysics;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Input;
+
+namespace Subsurface
+{
+    class ItemPrefab : MapEntityPrefab
+    {
+        //static string contentFolder = "Content/Items/";
+
+        string configFile;
+
+        //should the camera focus on the construction when selected
+        protected bool focusOnSelected;
+        //the amount of "camera offset" when selecting the construction
+        protected float offsetOnSelected;
+        //default size
+        protected Vector2 size;
+
+        //how close the character has to be to the item to pick it up
+        private float pickDistance;
+
+        //an area next to the construction
+        //the construction can be Activated() by a character inside the area
+        public List<Rectangle> Triggers;
+
+        public string ConfigFile
+        {
+            get { return configFile; }
+        }
+
+        public float PickDistance
+        {
+            get { return pickDistance; }
+        }
+
+
+        public override bool IsLinkable
+        {
+            get { return isLinkable; }
+        }
+
+        public bool FocusOnSelected
+        {
+            get { return focusOnSelected; }
+        }
+
+        public float OffsetOnSelected
+        {
+            get { return offsetOnSelected; }
+        }
+
+        public Vector2 Size
+        {
+            get { return size; }
+        }
+
+        public override void UpdatePlacing(SpriteBatch spriteBatch, Camera cam)
+        {
+            Vector2 position = Submarine.MouseToWorldGrid(cam); 
+            
+            if (!resizeHorizontal && !resizeVertical)
+            {
+                if (PlayerInput.LeftButtonClicked())
+                {
+                    new Item(new Rectangle((int)position.X, (int)position.Y, (int)sprite.size.X, (int)sprite.size.Y), this);
+                    //constructor.Invoke(lobject);
+
+                    placePosition = Vector2.Zero;
+
+                    selected = null;
+                    return;
+                }
+
+                sprite.Draw(spriteBatch, new Vector2(position.X + sprite.size.X / 2.0f, -position.Y + sprite.size.Y / 2.0f));
+            }
+            else
+            {
+                Vector2 placeSize = size;
+
+                if (placePosition == Vector2.Zero)
+                {
+                    if (PlayerInput.GetMouseState.LeftButton == ButtonState.Pressed)
+                        placePosition = position;
+                }
+                else
+                {
+                    if (resizeHorizontal)
+                        placeSize.X = Math.Max(position.X - placePosition.X, size.X);
+                    if (resizeVertical)
+                        placeSize.Y = Math.Max(placePosition.Y - position.Y, size.Y);
+
+                    if (PlayerInput.GetMouseState.LeftButton == ButtonState.Released)
+                    {
+                        new Item(new Rectangle((int)placePosition.X, (int)placePosition.Y, (int)placeSize.X, (int)placeSize.Y), this);
+                        
+                        selected = null;
+                        return;
+                    }
+
+                    position = placePosition;
+                }
+
+                sprite.DrawTiled(spriteBatch, new Vector2(position.X, -position.Y), placeSize, Color.White);
+            }
+            
+            if (PlayerInput.GetMouseState.RightButton == ButtonState.Pressed) selected = null;
+
+        }
+
+        public static void LoadAll(List<string> filePaths)
+        {
+            //string[] files = Directory.GetFiles(contentFolder, "*.xml", SearchOption.AllDirectories);
+
+            foreach (string filePath in filePaths)
+            {
+                XDocument doc = ToolBox.TryLoadXml(filePath);
+                if (doc == null) return;
+
+                if (doc.Root.Name.ToString().ToLower() == "item")
+                {
+                    new ItemPrefab(doc.Root, filePath);
+                }
+                else
+                {
+                    foreach (XElement element in doc.Root.Elements())
+                    {
+                        if (element.Name.ToString().ToLower() != "item") continue;
+
+                        new ItemPrefab(element, filePath);
+                    }
+                }
+            }
+        }
+
+        public ItemPrefab (XElement element, string filePath)
+        {
+
+            configFile = filePath;
+
+            name = ToolBox.GetAttributeString(element, "name", "");
+            if (name == "") DebugConsole.ThrowError("Unnamed item in "+filePath+"!");
+            
+            pickDistance = ConvertUnits.ToSimUnits(ToolBox.GetAttributeFloat(element, "pickdistance", 0.0f));
+            
+            isLinkable          = ToolBox.GetAttributeBool(element, "linkable", false);
+
+            resizeHorizontal    = ToolBox.GetAttributeBool(element, "resizehorizontal", false);
+            resizeVertical      = ToolBox.GetAttributeBool(element, "resizevertical", false);
+
+            focusOnSelected     = ToolBox.GetAttributeBool(element, "focusonselected", false);
+
+            offsetOnSelected    = ToolBox.GetAttributeFloat(element, "offsetonselected", 0.0f);
+
+            price = ToolBox.GetAttributeInt(element, "price", 0);
+            
+            Triggers            = new List<Rectangle>();
+
+            foreach (XElement subElement in element.Elements())
+            {
+                switch (subElement.Name.ToString().ToLower())
+                {
+                    case "sprite":
+                        sprite = new Sprite(subElement, Path.GetDirectoryName(filePath));
+                        size = sprite.size;
+                        break;
+                    case "trigger":
+                        Rectangle trigger = new Rectangle(0, 0, 10,10);
+
+                        trigger.X = ToolBox.GetAttributeInt(subElement, "x", 0);
+                        trigger.Y = ToolBox.GetAttributeInt(subElement, "y", 0);
+
+                        trigger.Width = ToolBox.GetAttributeInt(subElement, "width", 0);
+                        trigger.Height = ToolBox.GetAttributeInt(subElement, "height", 0);
+
+                        Triggers.Add(trigger);
+
+                        break;
+                }
+            }
+
+            list.Add(this);
+        }
+    }
+}
diff --git a/Subsurface/Items/RelatedItem.cs b/Subsurface/Source/Items/RelatedItem.cs
similarity index 100%
rename from Subsurface/Items/RelatedItem.cs
rename to Subsurface/Source/Items/RelatedItem.cs
diff --git a/Subsurface/Map/Entity.cs b/Subsurface/Source/Map/Entity.cs
similarity index 100%
rename from Subsurface/Map/Entity.cs
rename to Subsurface/Source/Map/Entity.cs
diff --git a/Subsurface/Map/Explosion.cs b/Subsurface/Source/Map/Explosion.cs
similarity index 100%
rename from Subsurface/Map/Explosion.cs
rename to Subsurface/Source/Map/Explosion.cs
diff --git a/Subsurface/Map/Gap.cs b/Subsurface/Source/Map/Gap.cs
similarity index 97%
rename from Subsurface/Map/Gap.cs
rename to Subsurface/Source/Map/Gap.cs
index 4a58ee403..ad8dc5541 100644
--- a/Subsurface/Map/Gap.cs
+++ b/Subsurface/Source/Map/Gap.cs
@@ -1,588 +1,588 @@
-using System;
-using System.Collections.Generic;
-using System.Xml.Linq;
-using FarseerPhysics;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System.Collections.ObjectModel;
-
-namespace Subsurface
-{
-    class Gap : MapEntity
-    {
-        public bool isHorizontal;
-
-        //private Sound waterSound;
-
-        //a value between 0.0f-1.0f (0.0 = closed, 1.0f = open)
-        float open;           
-
-        //the force of the water flow which is exerted on physics bodies
-        Vector2 flowForce;
-
-        Hull flowTargetHull;
-
-        float higherSurface;
-        float lowerSurface;
-
-        private int soundIndex;
-
-        float soundVolume;
-
-        public float Open
-        {
-            get { return open; }
-            set { open = MathHelper.Clamp(value, 0.0f, 1.0f); }
-        }
-
-        public Vector2 FlowForce
-        {
-            get { return flowForce*soundVolume; }
-        }
-
-        public Hull FlowTargetHull
-        {
-            get { return flowTargetHull; }
-        }
-
-        public Gap(Rectangle newRect)
-        {
-            rect = newRect;
-            linkedTo = new ObservableCollection<MapEntity>();
-
-            //waterSound = new Sound("waterstream", 0.0f);
-
-            flowForce = Vector2.Zero;
-
-            isHorizontal = (rect.Width < rect.Height);
-
-            open = 1.0f;
-
-            FindHulls();
-
-            mapEntityList.Add(this);
-        }
-
-        public Gap(Rectangle newRect, bool isHorizontal)
-        {
-            rect = newRect;
-            linkedTo = new ObservableCollection<MapEntity>();
-
-            flowForce = Vector2.Zero;
-
-            this.isHorizontal = isHorizontal;
-
-            open = 1.0f;
-
-            FindHulls();
-
-            mapEntityList.Add(this);
-        }
-
-        public static void UpdateHulls()
-        {
-            foreach (MapEntity entity in mapEntityList)
-            {
-                Gap g = entity as Gap;
-                if (g != null) g.FindHulls();
-            }
-        }
-
-        public override bool Contains(Vector2 position)
-        {
-            return (Submarine.RectContains(rect, position) &&
-                !Submarine.RectContains(new Rectangle(rect.X + 4, rect.Y - 4, rect.Width - 8, rect.Height - 8), position));
-        }
-
-        private void FindHulls()
-        {
-            Hull[] hulls = new Hull[2];
-
-            linkedTo.Clear();
-
-            foreach (Hull h in Hull.hullList)
-            {
-                if (!Submarine.RectsOverlap(h.Rect, rect, false)) continue;
-                
-                //if the gap is inside the hull completely, ignore it
-                if (rect.X > h.Rect.X && rect.X + rect.Width < h.Rect.X+h.Rect.Width && 
-                    rect.Y < h.Rect.Y && rect.Y - rect.Height > h.Rect.Y - h.Rect.Height) continue;
-
-                for (int i = 0; i < 2; i++ )
-                {
-                    if (hulls[i] != null) continue;
-                    hulls[i] = h;
-                    break;
-                }
-
-                if (hulls[1] != null) break;
-            }
-
-            if (hulls[0] == null && hulls[1] == null) return;
-
-            if (hulls[0]!=null && hulls[1]!=null)
-            {
-                if ((isHorizontal && hulls[0].Rect.X > hulls[1].Rect.X) || (!isHorizontal && hulls[0].Rect.Y < hulls[1].Rect.Y))
-                {
-                    //make sure that hull1 is the lefthand room if the gap is horizontal,
-                    //or that hull1 is the upper hull if the gap is vertical
-                    
-                    Hull temp = hulls[0];
-                    hulls[0] = hulls[1];
-                    hulls[1] = temp;
-           
-                }
-            }
-
-            linkedTo.Add(hulls[0]);
-            if (hulls[1] != null) linkedTo.Add(hulls[1]);
-
-            //if (hull1 != null && hull2 != null)
-            //{
-            //    if (isHorizontal)
-            //    {
-            //        //make sure that water1 is the lefthand room
-            //        //or that water2 is null if the gap doesn't lead to another room
-            //        if (hull1.Rect.X < hull2.Rect.X)
-            //        {
-            //            linkedTo.Add(hull1);
-            //            linkedTo.Add(hull2);
-            //        }
-            //        else
-            //        {
-            //            linkedTo.Add(hull2);
-            //            linkedTo.Add(hull1);
-            //        }
-            //    }
-            //    else
-            //    {
-            //        //make sure that water1 is the room on the top
-            //        //or that water2 is null if the gap doesn't lead to another room
-            //        if (hull1.Rect.Y > hull2.Rect.Y)
-            //        {
-            //            linkedTo.Add(hull1);
-            //            linkedTo.Add(hull2);
-            //        }
-            //        else
-            //        {
-            //            linkedTo.Add(hull2);
-            //            linkedTo.Add(hull1);
-            //        }
-            //    }
-            //}
-            //else
-            //{
-            //    linkedTo.Add(hull1);
-            //}
-        }
-
-        public override void Draw(SpriteBatch sb, bool editing)
-        {
-            //if (linkedTo[0] != null)
-            //    GUI.DrawLine(sb, new Vector2(Position.X, Position.Y),
-            //         new Vector2(linkedTo[0].Position.X, linkedTo[0].Position.Y), Color.Blue);
-
-            //if (linkedTo.Count > 1 && linkedTo[1] != null)
-            //    GUI.DrawLine(sb, new Vector2(Position.X, Position.Y),
-            //         new Vector2(linkedTo[1].Position.X, linkedTo[1].Position.Y), Color.Blue);
-
-
-            //GUI.DrawLine(sb, new Vector2(Position.X, -Position.Y), new Vector2(Position.X, -Position.Y)+new Vector2(flowForce.X, -flowForce.Y), Color.LightBlue);
-
-            if (!editing) return;
-
-            Color clr = (open == 0.0f) ? Color.Red : Color.Cyan;
-
-            GUI.DrawRectangle(sb, new Rectangle(rect.X, -rect.Y, rect.Width, rect.Height), clr);
-
-            if (isSelected)
-            {
-                GUI.DrawRectangle(sb,
-                    new Vector2(rect.X - 5, -rect.Y - 5),
-                    new Vector2(rect.Width + 10, rect.Height + 10),
-                    Color.Red);
-            }
-
-            //HUD.DrawLine(sb, new Vector2(position.X, -position.Y),
-            //    isHorizontal ? new Vector2(position.X, -position.Y + size) : new Vector2(position.X + size, -position.Y),
-            //    clr);
-        }
-        
-        public override void Update(Camera cam, float deltaTime)
-        {
-
-            soundVolume = soundVolume + ((flowForce.Length() < 100.0f) ? -deltaTime * 0.5f : deltaTime * 0.5f);
-            soundVolume = MathHelper.Clamp(soundVolume, 0.0f, 1.0f);
-
-            int index = (int)Math.Floor(flowForce.Length() / 100.0f);
-            index = Math.Min(index,2);
-
-            soundIndex = AmbientSoundManager.flowSounds[index].Loop(soundIndex, soundVolume, Position, 2000.0f);
-            //soundVolume = Math.Max(0.0f, soundVolume-deltaTime);
-            //Sound.UpdatePosition(soundIndex, Position, 2000.0f);                
-            
-
-            flowForce = Vector2.Zero;
-
-            if (open == 0.0f) return;
-
-            UpdateOxygen();
-
-
-            if (linkedTo.Count == 1)
-            {
-                //gap leading from a room to outside
-                UpdateRoomToOut(deltaTime);
-            }
-            else
-            {
-                //gap leading from a room to another
-                UpdateRoomToRoom(deltaTime);
-            }
-
-            if (FlowForce.Length() > 150.0f && flowTargetHull!=null && flowTargetHull.Volume < flowTargetHull.FullVolume)
-            {
-                //UpdateFlowForce();
-
-                Vector2 pos = SimPosition;
-                if (isHorizontal)
-                {
-                    pos.Y = ConvertUnits.ToSimUnits(MathHelper.Clamp(lowerSurface, rect.Y-rect.Height, rect.Y));
-
-                    Game1.ParticleManager.CreateParticle("watersplash",
-                        new Vector2(pos.X, pos.Y - Rand.Range(0.0f, 0.1f)),
-                        new Vector2(flowForce.X * Rand.Range(0.005f, 0.007f), flowForce.Y * Rand.Range(0.005f, 0.007f)));
-
-                    pos.Y = ConvertUnits.ToSimUnits(Rand.Range(lowerSurface, rect.Y - rect.Height));
-                        Game1.ParticleManager.CreateParticle("bubbles", pos, flowForce / 200.0f);
-                }
-                else
-                {
-                    pos.Y += Math.Sign(flowForce.Y) * ConvertUnits.ToSimUnits(rect.Height / 2.0f);
-                    for (int i = 0; i < rect.Width; i += (int)Rand.Range(80, 100))
-                    {
-                        pos.X = ConvertUnits.ToSimUnits(Rand.Range(rect.X, rect.X+rect.Width));
-                        Subsurface.Particles.Particle splash = Game1.ParticleManager.CreateParticle("watersplash", pos,
-                            new Vector2(flowForce.X * Rand.Range(0.005f, 0.008f), flowForce.Y * Rand.Range(0.005f, 0.008f)));
-
-                        if (splash!=null) splash.Size = splash.Size * MathHelper.Clamp(rect.Width / 50.0f, 0.8f, 4.0f);
-
-                        Game1.ParticleManager.CreateParticle("bubbles", pos, flowForce / 200.0f);
-                    }
-                }
-
-            }
-            
-            
-        }
-
-        void UpdateRoomToRoom(float deltaTime)
-        {
-            if (linkedTo.Count < 2) return;
-            Hull hull1 = (Hull)linkedTo[0];
-            Hull hull2 = (Hull)linkedTo[1];
-
-            if (hull1.Volume == 0.0 && hull2.Volume == 0.0) return;
-
-            float size = (isHorizontal) ? rect.Height : rect.Width;
-
-            //a variable affecting the water flow through the gap
-            //the larger the gap is, the faster the water flows
-            float sizeModifier = size / 100.0f * open;
-
-            //horizontal gap (such as a regular door)
-            if (isHorizontal)
-            {
-                //higherSurface = Math.Min(hull1.Surface,hull2.Surface);
-                    float delta=0.0f;                
-                //water level is above the lower boundary of the gap
-                if (Math.Max(hull1.Surface+hull1.WaveY[hull1.WaveY.Length - 1], hull2.Surface+hull2.WaveY[0]) > rect.Y - size)
-                {
-
-                    int dir = (hull1.Pressure > hull2.Pressure) ? 1 : -1;
-
-                    //water flowing from the righthand room to the lefthand room
-                    if (dir == -1)
-                    {
-                        if (!(hull2.Volume > 0.0f)) return;
-                        lowerSurface = hull1.Surface - hull1.WaveY[hull1.WaveY.Length - 1];
-                        //delta = Math.Min((room2.water.pressure - room1.water.pressure) * sizeModifier, Math.Min(room2.water.Volume, room2.Volume));
-                        //delta = Math.Min(delta, room1.Volume - room1.water.Volume + Water.MaxCompress);
-
-                        flowTargetHull = hull1;
-
-                        //make sure not to move more than what the room contains
-                        delta = Math.Min((hull2.Pressure - hull1.Pressure) * sizeModifier, Math.Min(hull2.Volume, hull2.FullVolume));
-                        
-                        //make sure not to place more water to the target room than it can hold
-                        delta = Math.Min(delta, hull1.FullVolume + Hull.MaxCompress - (hull1.Volume));
-                        hull1.Volume += delta;
-                        hull2.Volume -= delta;
-                        if (hull1.Volume > hull1.FullVolume)
-                        hull1.Pressure = Math.Max(hull1.Pressure, (hull1.Pressure + hull2.Pressure) / 2);
-
-                        flowForce = new Vector2(-delta, 0.0f);
-                    }
-                    else if (dir == 1)
-                    {
-                        if (!(hull1.Volume > 0.0f)) return;
-                        lowerSurface = hull2.Surface - hull2.WaveY[1];
-
-                        flowTargetHull = hull2;
-
-                        //make sure not to move more than what the room contains
-                        delta = Math.Min((hull1.Pressure - hull2.Pressure) * sizeModifier, Math.Min(hull1.Volume, hull1.FullVolume));
-
-                        //make sure not to place more water to the target room than it can hold
-                        delta = Math.Min(delta, hull2.FullVolume + Hull.MaxCompress - (hull2.Volume));
-                        hull1.Volume -= delta;
-                        hull2.Volume += delta;
-                        if (hull2.Volume > hull2.FullVolume)
-                        hull2.Pressure = Math.Max(hull2.Pressure, (hull1.Pressure + hull2.Pressure) / 2);
-                        
-                        flowForce = new Vector2(delta, 0.0f);
-                    }
-
-                    if (delta>100.0f)
-                    {
-                        float avg = (hull1.Surface + hull2.Surface) / 2.0f;
-                        //float avgVel = (hull2.WaveVel[1] + hull1.WaveVel[hull1.WaveY.Length - 2]) / 2.0f;
-
-                        if (hull1.Volume < hull1.FullVolume - Hull.MaxCompress &&
-                            hull1.Surface + hull1.WaveY[hull1.WaveY.Length - 1] < rect.Y)
-                        {
-                            hull1.WaveVel[hull1.WaveY.Length - 1] = (avg-(hull1.Surface + hull1.WaveY[hull1.WaveY.Length - 1]))*0.1f;
-                            hull1.WaveVel[hull1.WaveY.Length - 2] = hull1.WaveVel[hull1.WaveY.Length - 1];
-                        }
-
-                        if (hull2.Volume < hull2.FullVolume - Hull.MaxCompress &&
-                            hull2.Surface + hull2.WaveY[0] < rect.Y)
-                        {
-                            hull2.WaveVel[0] = (avg - (hull2.Surface + hull2.WaveY[0])) * 0.1f;
-                            hull2.WaveVel[1] = hull2.WaveVel[0];                   
-                        }
-                    }
-
-
-
-                }
-
-            }
-            else
-            {
-                //lower room is full of water
-                if (hull2.Pressure > hull1.Pressure)
-                {
-                    float delta = Math.Min(hull2.Volume - hull2.FullVolume + Hull.MaxCompress / 2.0f, deltaTime * 8000.0f * sizeModifier);
-
-                    flowForce = new Vector2(0.0f, Math.Min(hull2.Pressure - hull1.Pressure, 500.0f));
-
-                    delta = Math.Max(delta, 0.0f);
-                    hull1.Volume += delta;
-                    hull2.Volume -= delta;
-
-                    flowTargetHull = hull1;
-
-                    //delta = (water2.Pressure - water1.Pressure) * 0.1f;
-                    //if (delta > 0.1f)
-                    //{
-                    //    int posX = (int)((rect.X + size / 2.0f - water1.Rect.X) / Hull.WaveWidth);
-                    //    //water1.WaveY[posX] = delta;
-                    //    water1.WaveVel[posX] = delta * 0.01f;
-                    //}
-                    
-                    if (hull1.Volume > hull1.FullVolume)
-                    {
-                        hull1.Pressure = Math.Max(hull1.Pressure, (hull1.Pressure + hull2.Pressure) / 2);
-                    }
-
-                    
-
-                }
-                //there's water in the upper room, drop to lower
-                else if (hull1.Volume > 0)
-                {
-                    flowTargetHull = hull2;
-
-                    //make sure the amount of water moved isn't more than what the room contains
-                    float delta = Math.Min(hull1.Volume, deltaTime * 10000f * sizeModifier);
-                    //make sure not to place more water to the target room than it can hold
-                    delta = Math.Min(delta, (hull2.FullVolume + Math.Max(hull1.Volume - hull1.FullVolume, 0.0f)) - hull2.Volume + Hull.MaxCompress / 4.0f);
-                    
-                    hull1.Volume -= delta;
-                    hull2.Volume += delta;
-
-                    if (hull2.Volume > hull2.FullVolume)
-                    {
-                        hull2.Pressure = Math.Max(hull2.Pressure, (hull1.Pressure + hull2.Pressure) / 2);
-                    }
-
-                    flowForce = new Vector2(0.0f,-delta);
-
-                    //if (water2.Volume < water2.FullVolume - Hull.MaxCompress)
-                    //{
-                    //    int posX = (int)((rect.X + size / 2.0f - water1.Rect.X) / Hull.WaveWidth);
-                    //    //water1.WaveY[posX] = -delta;
-                    //    if (posX > -1 && posX < water2.WaveVel.Length)
-                    //        water1.WaveVel[posX] = -delta * 0.01f;
-
-                    //    posX = (int)((rect.X + size / 2.0f - water2.Rect.X) / Hull.WaveWidth);                        
-                    //    //water2.WaveY[posX] = delta;
-                    //    if (posX > -1 && posX<water2.WaveVel.Length)
-                    //        water2.WaveVel[posX] = delta * 0.01f;
-                    //}
-                }
-            }
-
-            if (open > 0.0f)
-            {
-                if (hull1.Volume>hull1.FullVolume && hull2.Volume>hull2.FullVolume)
-                {
-                    float avgLethality = (hull1.LethalPressure + hull2.LethalPressure) / 2.0f;
-                    hull1.LethalPressure = avgLethality;
-                    hull2.LethalPressure = avgLethality;
-                }
-                else 
-                {
-                    hull1.LethalPressure = 0.0f;
-                    hull2.LethalPressure = 0.0f;
-                }
-            }
-        }
-
-        void UpdateRoomToOut(float deltaTime)
-        {
-            if (linkedTo.Count != 1) return;
-
-            float size = (isHorizontal) ? rect.Height : rect.Width;
-
-            Hull hull1 = (Hull)linkedTo[0];
-
-            //a variable affecting the water flow through the gap
-            //the larger the gap is, the faster the water flows
-            float sizeModifier = size * open;
-
-            float delta = Hull.MaxCompress * sizeModifier * deltaTime;
-            
-            //make sure not to place more water to the target room than it can hold
-            delta = Math.Min(delta, hull1.FullVolume + Hull.MaxCompress - hull1.Volume);
-            hull1.Volume += delta;
-
-            if (hull1.Volume > hull1.FullVolume) hull1.Pressure += 0.5f;
-
-            flowTargetHull = hull1;
-
-            if (isHorizontal)
-            {
-                //water flowing from right to left
-                if (rect.X > hull1.Rect.X + hull1.Rect.Width / 2.0f)
-                {
-                    flowForce = new Vector2(-delta, 0.0f);
-                    
-                }
-                else
-                {
-                    flowForce = new Vector2(delta, 0.0f);
-                }
-
-                higherSurface = hull1.Surface;
-                lowerSurface = rect.Y;
-
-                if (hull1.Volume < hull1.FullVolume - Hull.MaxCompress &&
-                    hull1.Surface > -rect.Y)
-                {
-                    float vel = (rect.Y + hull1.Surface) * 0.03f;
-
-                    if (rect.X > hull1.Rect.X + hull1.Rect.Width / 2.0f)
-                    {
-                        hull1.WaveVel[hull1.WaveY.Length - 1] += vel;
-                        hull1.WaveVel[hull1.WaveY.Length - 2] += vel;
-                    }
-                    else
-                    {
-                        hull1.WaveVel[0] += vel;
-                        hull1.WaveVel[1] += vel;
-                    }
-                }
-            }
-            else
-            {
-                if (rect.Y > hull1.Rect.Y - hull1.Rect.Height / 2.0f)
-                {
-                    flowForce = new Vector2(0.0f, -delta);
-                }
-                else
-                {
-                    flowForce = new Vector2(0.0f, delta);
-                }
-            }
-        }
-
-        private void UpdateOxygen()
-        {
-            if (linkedTo.Count < 2) return;
-            Hull hull1 = (Hull)linkedTo[0];
-            Hull hull2 = (Hull)linkedTo[1];
-
-            float totalOxygen = hull1.Oxygen + hull2.Oxygen;
-            float totalVolume = (hull1.FullVolume + hull2.FullVolume);
-
-            hull1.Oxygen += Math.Sign(totalOxygen * hull1.FullVolume / (totalVolume) - hull1.Oxygen) * Hull.OxygenDistributionSpeed;
-            hull2.Oxygen += Math.Sign(totalOxygen * hull2.FullVolume / (totalVolume) - hull2.Oxygen) * Hull.OxygenDistributionSpeed;            
-        }
-
-        public override void Remove()
-        {
-            base.Remove();
-
-            if (soundIndex > -1) Sounds.SoundManager.Stop(soundIndex);
-        }
-
-        public override XElement Save(XDocument doc)
-        {
-            XElement element = new XElement("Gap");
-
-            element.Add(new XAttribute("ID", ID),
-                new XAttribute("x", rect.X),
-                new XAttribute("y", rect.Y),
-                new XAttribute("width", rect.Width),
-                new XAttribute("height", rect.Height));
-
-            //if (linkedTo != null)
-            //{
-            //    int i = 0;
-            //    foreach (Entity e in linkedTo)
-            //    {
-            //        if (e == null) continue;
-            //        element.Add(new XAttribute("linkedto" + i, e.ID));
-            //        i += 1;
-            //    }
-            //}
-
-            doc.Root.Add(element);
-
-            return element;
-        }
-
-
-        public static void Load(XElement element)
-        {
-            Rectangle rect = new Rectangle(
-                int.Parse(element.Attribute("x").Value),
-                int.Parse(element.Attribute("y").Value),
-                int.Parse(element.Attribute("width").Value),
-                int.Parse(element.Attribute("height").Value));
-
-            Gap g = new Gap(rect);
-            g.ID = int.Parse(element.Attribute("ID").Value);
-            
-            g.linkedToID = new List<int>();
-            //int i = 0;
-            //while (element.Attribute("linkedto" + i) != null)
-            //{
-            //    g.linkedToID.Add(int.Parse(element.Attribute("linkedto" + i).Value));
-            //    i += 1;
-            //}
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Xml.Linq;
+using FarseerPhysics;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System.Collections.ObjectModel;
+
+namespace Subsurface
+{
+    class Gap : MapEntity
+    {
+        public bool isHorizontal;
+
+        //private Sound waterSound;
+
+        //a value between 0.0f-1.0f (0.0 = closed, 1.0f = open)
+        float open;           
+
+        //the force of the water flow which is exerted on physics bodies
+        Vector2 flowForce;
+
+        Hull flowTargetHull;
+
+        float higherSurface;
+        float lowerSurface;
+
+        private int soundIndex;
+
+        float soundVolume;
+
+        public float Open
+        {
+            get { return open; }
+            set { open = MathHelper.Clamp(value, 0.0f, 1.0f); }
+        }
+
+        public Vector2 FlowForce
+        {
+            get { return flowForce*soundVolume; }
+        }
+
+        public Hull FlowTargetHull
+        {
+            get { return flowTargetHull; }
+        }
+
+        public Gap(Rectangle newRect)
+        {
+            rect = newRect;
+            linkedTo = new ObservableCollection<MapEntity>();
+
+            //waterSound = new Sound("waterstream", 0.0f);
+
+            flowForce = Vector2.Zero;
+
+            isHorizontal = (rect.Width < rect.Height);
+
+            open = 1.0f;
+
+            FindHulls();
+
+            mapEntityList.Add(this);
+        }
+
+        public Gap(Rectangle newRect, bool isHorizontal)
+        {
+            rect = newRect;
+            linkedTo = new ObservableCollection<MapEntity>();
+
+            flowForce = Vector2.Zero;
+
+            this.isHorizontal = isHorizontal;
+
+            open = 1.0f;
+
+            FindHulls();
+
+            mapEntityList.Add(this);
+        }
+
+        public static void UpdateHulls()
+        {
+            foreach (MapEntity entity in mapEntityList)
+            {
+                Gap g = entity as Gap;
+                if (g != null) g.FindHulls();
+            }
+        }
+
+        public override bool Contains(Vector2 position)
+        {
+            return (Submarine.RectContains(rect, position) &&
+                !Submarine.RectContains(new Rectangle(rect.X + 4, rect.Y - 4, rect.Width - 8, rect.Height - 8), position));
+        }
+
+        private void FindHulls()
+        {
+            Hull[] hulls = new Hull[2];
+
+            linkedTo.Clear();
+
+            foreach (Hull h in Hull.hullList)
+            {
+                if (!Submarine.RectsOverlap(h.Rect, rect, false)) continue;
+                
+                //if the gap is inside the hull completely, ignore it
+                if (rect.X > h.Rect.X && rect.X + rect.Width < h.Rect.X+h.Rect.Width && 
+                    rect.Y < h.Rect.Y && rect.Y - rect.Height > h.Rect.Y - h.Rect.Height) continue;
+
+                for (int i = 0; i < 2; i++ )
+                {
+                    if (hulls[i] != null) continue;
+                    hulls[i] = h;
+                    break;
+                }
+
+                if (hulls[1] != null) break;
+            }
+
+            if (hulls[0] == null && hulls[1] == null) return;
+
+            if (hulls[0]!=null && hulls[1]!=null)
+            {
+                if ((isHorizontal && hulls[0].Rect.X > hulls[1].Rect.X) || (!isHorizontal && hulls[0].Rect.Y < hulls[1].Rect.Y))
+                {
+                    //make sure that hull1 is the lefthand room if the gap is horizontal,
+                    //or that hull1 is the upper hull if the gap is vertical
+                    
+                    Hull temp = hulls[0];
+                    hulls[0] = hulls[1];
+                    hulls[1] = temp;
+           
+                }
+            }
+
+            linkedTo.Add(hulls[0]);
+            if (hulls[1] != null) linkedTo.Add(hulls[1]);
+
+            //if (hull1 != null && hull2 != null)
+            //{
+            //    if (isHorizontal)
+            //    {
+            //        //make sure that water1 is the lefthand room
+            //        //or that water2 is null if the gap doesn't lead to another room
+            //        if (hull1.Rect.X < hull2.Rect.X)
+            //        {
+            //            linkedTo.Add(hull1);
+            //            linkedTo.Add(hull2);
+            //        }
+            //        else
+            //        {
+            //            linkedTo.Add(hull2);
+            //            linkedTo.Add(hull1);
+            //        }
+            //    }
+            //    else
+            //    {
+            //        //make sure that water1 is the room on the top
+            //        //or that water2 is null if the gap doesn't lead to another room
+            //        if (hull1.Rect.Y > hull2.Rect.Y)
+            //        {
+            //            linkedTo.Add(hull1);
+            //            linkedTo.Add(hull2);
+            //        }
+            //        else
+            //        {
+            //            linkedTo.Add(hull2);
+            //            linkedTo.Add(hull1);
+            //        }
+            //    }
+            //}
+            //else
+            //{
+            //    linkedTo.Add(hull1);
+            //}
+        }
+
+        public override void Draw(SpriteBatch sb, bool editing)
+        {
+            //if (linkedTo[0] != null)
+            //    GUI.DrawLine(sb, new Vector2(Position.X, Position.Y),
+            //         new Vector2(linkedTo[0].Position.X, linkedTo[0].Position.Y), Color.Blue);
+
+            //if (linkedTo.Count > 1 && linkedTo[1] != null)
+            //    GUI.DrawLine(sb, new Vector2(Position.X, Position.Y),
+            //         new Vector2(linkedTo[1].Position.X, linkedTo[1].Position.Y), Color.Blue);
+
+
+            //GUI.DrawLine(sb, new Vector2(Position.X, -Position.Y), new Vector2(Position.X, -Position.Y)+new Vector2(flowForce.X, -flowForce.Y), Color.LightBlue);
+
+            if (!editing) return;
+
+            Color clr = (open == 0.0f) ? Color.Red : Color.Cyan;
+
+            GUI.DrawRectangle(sb, new Rectangle(rect.X, -rect.Y, rect.Width, rect.Height), clr);
+
+            if (isSelected)
+            {
+                GUI.DrawRectangle(sb,
+                    new Vector2(rect.X - 5, -rect.Y - 5),
+                    new Vector2(rect.Width + 10, rect.Height + 10),
+                    Color.Red);
+            }
+
+            //HUD.DrawLine(sb, new Vector2(position.X, -position.Y),
+            //    isHorizontal ? new Vector2(position.X, -position.Y + size) : new Vector2(position.X + size, -position.Y),
+            //    clr);
+        }
+        
+        public override void Update(Camera cam, float deltaTime)
+        {
+
+            soundVolume = soundVolume + ((flowForce.Length() < 100.0f) ? -deltaTime * 0.5f : deltaTime * 0.5f);
+            soundVolume = MathHelper.Clamp(soundVolume, 0.0f, 1.0f);
+
+            int index = (int)Math.Floor(flowForce.Length() / 100.0f);
+            index = Math.Min(index,2);
+
+            soundIndex = AmbientSoundManager.flowSounds[index].Loop(soundIndex, soundVolume, Position, 2000.0f);
+            //soundVolume = Math.Max(0.0f, soundVolume-deltaTime);
+            //Sound.UpdatePosition(soundIndex, Position, 2000.0f);                
+            
+
+            flowForce = Vector2.Zero;
+
+            if (open == 0.0f) return;
+
+            UpdateOxygen();
+
+
+            if (linkedTo.Count == 1)
+            {
+                //gap leading from a room to outside
+                UpdateRoomToOut(deltaTime);
+            }
+            else
+            {
+                //gap leading from a room to another
+                UpdateRoomToRoom(deltaTime);
+            }
+
+            if (FlowForce.Length() > 150.0f && flowTargetHull!=null && flowTargetHull.Volume < flowTargetHull.FullVolume)
+            {
+                //UpdateFlowForce();
+
+                Vector2 pos = SimPosition;
+                if (isHorizontal)
+                {
+                    pos.Y = ConvertUnits.ToSimUnits(MathHelper.Clamp(lowerSurface, rect.Y-rect.Height, rect.Y));
+
+                    Game1.ParticleManager.CreateParticle("watersplash",
+                        new Vector2(pos.X, pos.Y - Rand.Range(0.0f, 0.1f)),
+                        new Vector2(flowForce.X * Rand.Range(0.005f, 0.007f), flowForce.Y * Rand.Range(0.005f, 0.007f)));
+
+                    pos.Y = ConvertUnits.ToSimUnits(Rand.Range(lowerSurface, rect.Y - rect.Height));
+                        Game1.ParticleManager.CreateParticle("bubbles", pos, flowForce / 200.0f);
+                }
+                else
+                {
+                    pos.Y += Math.Sign(flowForce.Y) * ConvertUnits.ToSimUnits(rect.Height / 2.0f);
+                    for (int i = 0; i < rect.Width; i += (int)Rand.Range(80, 100))
+                    {
+                        pos.X = ConvertUnits.ToSimUnits(Rand.Range(rect.X, rect.X+rect.Width));
+                        Subsurface.Particles.Particle splash = Game1.ParticleManager.CreateParticle("watersplash", pos,
+                            new Vector2(flowForce.X * Rand.Range(0.005f, 0.008f), flowForce.Y * Rand.Range(0.005f, 0.008f)));
+
+                        if (splash!=null) splash.Size = splash.Size * MathHelper.Clamp(rect.Width / 50.0f, 0.8f, 4.0f);
+
+                        Game1.ParticleManager.CreateParticle("bubbles", pos, flowForce / 200.0f);
+                    }
+                }
+
+            }
+            
+            
+        }
+
+        void UpdateRoomToRoom(float deltaTime)
+        {
+            if (linkedTo.Count < 2) return;
+            Hull hull1 = (Hull)linkedTo[0];
+            Hull hull2 = (Hull)linkedTo[1];
+
+            if (hull1.Volume == 0.0 && hull2.Volume == 0.0) return;
+
+            float size = (isHorizontal) ? rect.Height : rect.Width;
+
+            //a variable affecting the water flow through the gap
+            //the larger the gap is, the faster the water flows
+            float sizeModifier = size / 100.0f * open;
+
+            //horizontal gap (such as a regular door)
+            if (isHorizontal)
+            {
+                //higherSurface = Math.Min(hull1.Surface,hull2.Surface);
+                    float delta=0.0f;                
+                //water level is above the lower boundary of the gap
+                if (Math.Max(hull1.Surface+hull1.WaveY[hull1.WaveY.Length - 1], hull2.Surface+hull2.WaveY[0]) > rect.Y - size)
+                {
+
+                    int dir = (hull1.Pressure > hull2.Pressure) ? 1 : -1;
+
+                    //water flowing from the righthand room to the lefthand room
+                    if (dir == -1)
+                    {
+                        if (!(hull2.Volume > 0.0f)) return;
+                        lowerSurface = hull1.Surface - hull1.WaveY[hull1.WaveY.Length - 1];
+                        //delta = Math.Min((room2.water.pressure - room1.water.pressure) * sizeModifier, Math.Min(room2.water.Volume, room2.Volume));
+                        //delta = Math.Min(delta, room1.Volume - room1.water.Volume + Water.MaxCompress);
+
+                        flowTargetHull = hull1;
+
+                        //make sure not to move more than what the room contains
+                        delta = Math.Min((hull2.Pressure - hull1.Pressure) * sizeModifier, Math.Min(hull2.Volume, hull2.FullVolume));
+                        
+                        //make sure not to place more water to the target room than it can hold
+                        delta = Math.Min(delta, hull1.FullVolume + Hull.MaxCompress - (hull1.Volume));
+                        hull1.Volume += delta;
+                        hull2.Volume -= delta;
+                        if (hull1.Volume > hull1.FullVolume)
+                        hull1.Pressure = Math.Max(hull1.Pressure, (hull1.Pressure + hull2.Pressure) / 2);
+
+                        flowForce = new Vector2(-delta, 0.0f);
+                    }
+                    else if (dir == 1)
+                    {
+                        if (!(hull1.Volume > 0.0f)) return;
+                        lowerSurface = hull2.Surface - hull2.WaveY[1];
+
+                        flowTargetHull = hull2;
+
+                        //make sure not to move more than what the room contains
+                        delta = Math.Min((hull1.Pressure - hull2.Pressure) * sizeModifier, Math.Min(hull1.Volume, hull1.FullVolume));
+
+                        //make sure not to place more water to the target room than it can hold
+                        delta = Math.Min(delta, hull2.FullVolume + Hull.MaxCompress - (hull2.Volume));
+                        hull1.Volume -= delta;
+                        hull2.Volume += delta;
+                        if (hull2.Volume > hull2.FullVolume)
+                        hull2.Pressure = Math.Max(hull2.Pressure, (hull1.Pressure + hull2.Pressure) / 2);
+                        
+                        flowForce = new Vector2(delta, 0.0f);
+                    }
+
+                    if (delta>100.0f)
+                    {
+                        float avg = (hull1.Surface + hull2.Surface) / 2.0f;
+                        //float avgVel = (hull2.WaveVel[1] + hull1.WaveVel[hull1.WaveY.Length - 2]) / 2.0f;
+
+                        if (hull1.Volume < hull1.FullVolume - Hull.MaxCompress &&
+                            hull1.Surface + hull1.WaveY[hull1.WaveY.Length - 1] < rect.Y)
+                        {
+                            hull1.WaveVel[hull1.WaveY.Length - 1] = (avg-(hull1.Surface + hull1.WaveY[hull1.WaveY.Length - 1]))*0.1f;
+                            hull1.WaveVel[hull1.WaveY.Length - 2] = hull1.WaveVel[hull1.WaveY.Length - 1];
+                        }
+
+                        if (hull2.Volume < hull2.FullVolume - Hull.MaxCompress &&
+                            hull2.Surface + hull2.WaveY[0] < rect.Y)
+                        {
+                            hull2.WaveVel[0] = (avg - (hull2.Surface + hull2.WaveY[0])) * 0.1f;
+                            hull2.WaveVel[1] = hull2.WaveVel[0];                   
+                        }
+                    }
+
+
+
+                }
+
+            }
+            else
+            {
+                //lower room is full of water
+                if (hull2.Pressure > hull1.Pressure)
+                {
+                    float delta = Math.Min(hull2.Volume - hull2.FullVolume + Hull.MaxCompress / 2.0f, deltaTime * 8000.0f * sizeModifier);
+
+                    flowForce = new Vector2(0.0f, Math.Min(hull2.Pressure - hull1.Pressure, 500.0f));
+
+                    delta = Math.Max(delta, 0.0f);
+                    hull1.Volume += delta;
+                    hull2.Volume -= delta;
+
+                    flowTargetHull = hull1;
+
+                    //delta = (water2.Pressure - water1.Pressure) * 0.1f;
+                    //if (delta > 0.1f)
+                    //{
+                    //    int posX = (int)((rect.X + size / 2.0f - water1.Rect.X) / Hull.WaveWidth);
+                    //    //water1.WaveY[posX] = delta;
+                    //    water1.WaveVel[posX] = delta * 0.01f;
+                    //}
+                    
+                    if (hull1.Volume > hull1.FullVolume)
+                    {
+                        hull1.Pressure = Math.Max(hull1.Pressure, (hull1.Pressure + hull2.Pressure) / 2);
+                    }
+
+                    
+
+                }
+                //there's water in the upper room, drop to lower
+                else if (hull1.Volume > 0)
+                {
+                    flowTargetHull = hull2;
+
+                    //make sure the amount of water moved isn't more than what the room contains
+                    float delta = Math.Min(hull1.Volume, deltaTime * 10000f * sizeModifier);
+                    //make sure not to place more water to the target room than it can hold
+                    delta = Math.Min(delta, (hull2.FullVolume + Math.Max(hull1.Volume - hull1.FullVolume, 0.0f)) - hull2.Volume + Hull.MaxCompress / 4.0f);
+                    
+                    hull1.Volume -= delta;
+                    hull2.Volume += delta;
+
+                    if (hull2.Volume > hull2.FullVolume)
+                    {
+                        hull2.Pressure = Math.Max(hull2.Pressure, (hull1.Pressure + hull2.Pressure) / 2);
+                    }
+
+                    flowForce = new Vector2(0.0f,-delta);
+
+                    //if (water2.Volume < water2.FullVolume - Hull.MaxCompress)
+                    //{
+                    //    int posX = (int)((rect.X + size / 2.0f - water1.Rect.X) / Hull.WaveWidth);
+                    //    //water1.WaveY[posX] = -delta;
+                    //    if (posX > -1 && posX < water2.WaveVel.Length)
+                    //        water1.WaveVel[posX] = -delta * 0.01f;
+
+                    //    posX = (int)((rect.X + size / 2.0f - water2.Rect.X) / Hull.WaveWidth);                        
+                    //    //water2.WaveY[posX] = delta;
+                    //    if (posX > -1 && posX<water2.WaveVel.Length)
+                    //        water2.WaveVel[posX] = delta * 0.01f;
+                    //}
+                }
+            }
+
+            if (open > 0.0f)
+            {
+                if (hull1.Volume>hull1.FullVolume && hull2.Volume>hull2.FullVolume)
+                {
+                    float avgLethality = (hull1.LethalPressure + hull2.LethalPressure) / 2.0f;
+                    hull1.LethalPressure = avgLethality;
+                    hull2.LethalPressure = avgLethality;
+                }
+                else 
+                {
+                    hull1.LethalPressure = 0.0f;
+                    hull2.LethalPressure = 0.0f;
+                }
+            }
+        }
+
+        void UpdateRoomToOut(float deltaTime)
+        {
+            if (linkedTo.Count != 1) return;
+
+            float size = (isHorizontal) ? rect.Height : rect.Width;
+
+            Hull hull1 = (Hull)linkedTo[0];
+
+            //a variable affecting the water flow through the gap
+            //the larger the gap is, the faster the water flows
+            float sizeModifier = size * open;
+
+            float delta = Hull.MaxCompress * sizeModifier * deltaTime;
+            
+            //make sure not to place more water to the target room than it can hold
+            delta = Math.Min(delta, hull1.FullVolume + Hull.MaxCompress - hull1.Volume);
+            hull1.Volume += delta;
+
+            if (hull1.Volume > hull1.FullVolume) hull1.Pressure += 0.5f;
+
+            flowTargetHull = hull1;
+
+            if (isHorizontal)
+            {
+                //water flowing from right to left
+                if (rect.X > hull1.Rect.X + hull1.Rect.Width / 2.0f)
+                {
+                    flowForce = new Vector2(-delta, 0.0f);
+                    
+                }
+                else
+                {
+                    flowForce = new Vector2(delta, 0.0f);
+                }
+
+                higherSurface = hull1.Surface;
+                lowerSurface = rect.Y;
+
+                if (hull1.Volume < hull1.FullVolume - Hull.MaxCompress &&
+                    hull1.Surface > -rect.Y)
+                {
+                    float vel = (rect.Y + hull1.Surface) * 0.03f;
+
+                    if (rect.X > hull1.Rect.X + hull1.Rect.Width / 2.0f)
+                    {
+                        hull1.WaveVel[hull1.WaveY.Length - 1] += vel;
+                        hull1.WaveVel[hull1.WaveY.Length - 2] += vel;
+                    }
+                    else
+                    {
+                        hull1.WaveVel[0] += vel;
+                        hull1.WaveVel[1] += vel;
+                    }
+                }
+            }
+            else
+            {
+                if (rect.Y > hull1.Rect.Y - hull1.Rect.Height / 2.0f)
+                {
+                    flowForce = new Vector2(0.0f, -delta);
+                }
+                else
+                {
+                    flowForce = new Vector2(0.0f, delta);
+                }
+            }
+        }
+
+        private void UpdateOxygen()
+        {
+            if (linkedTo.Count < 2) return;
+            Hull hull1 = (Hull)linkedTo[0];
+            Hull hull2 = (Hull)linkedTo[1];
+
+            float totalOxygen = hull1.Oxygen + hull2.Oxygen;
+            float totalVolume = (hull1.FullVolume + hull2.FullVolume);
+
+            hull1.Oxygen += Math.Sign(totalOxygen * hull1.FullVolume / (totalVolume) - hull1.Oxygen) * Hull.OxygenDistributionSpeed;
+            hull2.Oxygen += Math.Sign(totalOxygen * hull2.FullVolume / (totalVolume) - hull2.Oxygen) * Hull.OxygenDistributionSpeed;            
+        }
+
+        public override void Remove()
+        {
+            base.Remove();
+
+            if (soundIndex > -1) Sounds.SoundManager.Stop(soundIndex);
+        }
+
+        public override XElement Save(XDocument doc)
+        {
+            XElement element = new XElement("Gap");
+
+            element.Add(new XAttribute("ID", ID),
+                new XAttribute("x", rect.X),
+                new XAttribute("y", rect.Y),
+                new XAttribute("width", rect.Width),
+                new XAttribute("height", rect.Height));
+
+            //if (linkedTo != null)
+            //{
+            //    int i = 0;
+            //    foreach (Entity e in linkedTo)
+            //    {
+            //        if (e == null) continue;
+            //        element.Add(new XAttribute("linkedto" + i, e.ID));
+            //        i += 1;
+            //    }
+            //}
+
+            doc.Root.Add(element);
+
+            return element;
+        }
+
+
+        public static void Load(XElement element)
+        {
+            Rectangle rect = new Rectangle(
+                int.Parse(element.Attribute("x").Value),
+                int.Parse(element.Attribute("y").Value),
+                int.Parse(element.Attribute("width").Value),
+                int.Parse(element.Attribute("height").Value));
+
+            Gap g = new Gap(rect);
+            g.ID = int.Parse(element.Attribute("ID").Value);
+            
+            g.linkedToID = new List<int>();
+            //int i = 0;
+            //while (element.Attribute("linkedto" + i) != null)
+            //{
+            //    g.linkedToID.Add(int.Parse(element.Attribute("linkedto" + i).Value));
+            //    i += 1;
+            //}
+        }
+    }
+}
diff --git a/Subsurface/Map/Hull.cs b/Subsurface/Source/Map/Hull.cs
similarity index 96%
rename from Subsurface/Map/Hull.cs
rename to Subsurface/Source/Map/Hull.cs
index 488a9f351..3c77ad2b6 100644
--- a/Subsurface/Map/Hull.cs
+++ b/Subsurface/Source/Map/Hull.cs
@@ -1,435 +1,436 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Xml.Linq;
-using FarseerPhysics;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-
-namespace Subsurface
-{
-
-    class Hull : MapEntity
-    {
-        public static List<Hull> hullList = new List<Hull>();
-
-        public static bool EditWater;
-
-        public static WaterRenderer renderer;
-        
-        public const float OxygenDistributionSpeed = 500.0f;
-        public const float OxygenDetoriationSpeed = 0.3f;
-        public const float OxygenConsumptionSpeed = 1000.0f;
-
-        public const int WaveWidth = 16;
-        const float WaveStiffness = 0.003f;
-        const float WaveSpread = 0.05f;
-        const float WaveDampening = 0.01f;
-
-        //how much excess water the room can contain  (= more than the volume of the room)
-        public const float MaxCompress = 10000f;
-        
-        public readonly Dictionary<string, PropertyDescriptor> properties;
-
-        private float lethalPressure;
-
-        private float surface;
-        private float volume;
-        private float pressure;
-
-        private float oxygen;
-
-        private bool update;
-
-        float[] waveY; //displacement from the surface of the water
-        float[] waveVel; //velocity of the point
-
-        float[] leftDelta;
-        float[] rightDelta;
-
-        public override bool IsLinkable
-        {
-            get { return true; }
-        }
-
-        public float LethalPressure
-        {
-            get { return lethalPressure; }
-            set { lethalPressure = MathHelper.Clamp(value, 0.0f, 100.0f); }
-        }
-
-        public Vector2 Size
-        {
-            get { return new Vector2(rect.Width, rect.Height); }
-        }
-
-        public float Surface
-        {
-            get { return surface; }
-        }
-
-        public float Volume
-        {
-            get { return volume; }
-            set
-            {               
-                volume = MathHelper.Clamp(value, 0.0f, FullVolume + MaxCompress);
-                if (volume < FullVolume) Pressure = rect.Y - rect.Height + volume / rect.Width;
-                if (volume > 0.0f) update = true;
-            }
-        }
-
-        public float Oxygen
-        {
-            get { return oxygen; }
-            set { oxygen = MathHelper.Clamp(value, 0.0f, FullVolume); }
-        }
-
-        public float OxygenPercentage
-        {
-            get { return oxygen / FullVolume * 100.0f; }
-            set { Oxygen = (value / 100.0f) * FullVolume; }
-        }
-
-        public float FullVolume
-        {
-            get { return (rect.Width * rect.Height); }
-        }
-
-        public float Pressure
-        {
-            get { return pressure; }
-            set { pressure = value; }
-        }
-
-        public float[] WaveY
-        {
-            get { return waveY; }
-        }
-
-        public float[] WaveVel
-        {
-            get { return waveVel; }
-        }
-
-        public Hull(Rectangle rectangle)
-        {
-            rect = rectangle;
-            
-            OxygenPercentage = Rand.Range(0.0f, 100.0f, false);
-
-            properties = TypeDescriptor.GetProperties(GetType())
-                .Cast<PropertyDescriptor>()
-                .ToDictionary(pr => pr.Name);
-
-            int arraySize = (rectangle.Width / WaveWidth + 1);
-            waveY = new float[arraySize];
-            waveVel = new float[arraySize];
-
-            leftDelta = new float[arraySize];
-            rightDelta = new float[arraySize];
-
-            surface = rect.Y - rect.Height;
-
-            aiTarget = new AITarget(this);
-            aiTarget.SightRange = (rect.Width + rect.Height)*10.0f;
-
-            hullList.Add(this);
-
-            Item.UpdateHulls();
-            Gap.UpdateHulls();
-
-            Volume = 0.0f;
-
-            //add to list of entities as well
-            mapEntityList.Add(this);
-        }
-
-        public override bool Contains(Vector2 position)
-        {
-            return (Submarine.RectContains(rect, position) &&
-                !Submarine.RectContains(new Rectangle(rect.X + 8, rect.Y - 8, rect.Width - 16, rect.Height - 16), position));
-        }
-
-        public int GetWaveIndex(Vector2 position)
-        {
-            int index = (int)(position.X - rect.X) / WaveWidth;
-            index = MathHelper.Clamp(index, 0, waveY.Length-1);
-            return index;
-        }
-
-        public override void Move(Vector2 amount)
-        {
-            rect.X += (int)amount.X;
-            rect.Y += (int)amount.Y;
-
-            Item.UpdateHulls();
-            Gap.UpdateHulls();
-        }
-
-        public override void Remove()
-        {
-            base.Remove();
-
-            Item.UpdateHulls();
-            Gap.UpdateHulls();
-
-            //renderer.Dispose();
-
-            hullList.Remove(this);
-        }
-
-        public override void Update(Camera cam, float deltaTime)
-        {
-            Oxygen -= OxygenDetoriationSpeed * deltaTime;
-
-            if (EditWater)
-            {
-                Vector2 position = cam.ScreenToWorld(PlayerInput.MousePosition);
-                if (Submarine.RectContains(rect, position))
-                {
-                    if (PlayerInput.LeftButtonDown())
-                    {
-                        waveY[(int)(position.X - rect.X) / WaveWidth] = 100.0f;
-                        Volume = Volume + 1500.0f;
-                    }
-                    else if (PlayerInput.GetMouseState.RightButton == Microsoft.Xna.Framework.Input.ButtonState.Pressed)
-                    {
-                        Volume = Volume - 1500.0f;
-                    }
-                }
-            }
-
-
-            if (!update) return;
-
-            float surfaceY = rect.Y - rect.Height + Volume / rect.Width;
-            for (int i = 0; i < waveY.Length; i++)
-            {
-                float maxDelta = Math.Max(Math.Abs(rightDelta[i]), Math.Abs(leftDelta[i]));
-                if (maxDelta > Rand.Range(0.2f,10.0f))
-                {
-                    Game1.ParticleManager.CreateParticle("mist",
-                        ConvertUnits.ToSimUnits(new Vector2(rect.X + WaveWidth * i,surface + waveY[i])),
-                        new Vector2(0.0f, -0.5f));
-                }
-
-                waveY[i] = waveY[i] + waveVel[i];
-
-                if (surfaceY + waveY[i] > rect.Y)
-                {
-                    waveY[i] -= (surfaceY + waveY[i]) - rect.Y;
-                    waveVel[i] = waveVel[i] * -0.5f;
-                }
-                else if (surfaceY + waveY[i] < rect.Y - rect.Height)
-                {
-                    waveY[i] -= (surfaceY + waveY[i]) - (rect.Y - rect.Height);
-                    waveVel[i] = waveVel[i] * -0.5f;
-                }
-
-
-                //acceleration
-                float a = -WaveStiffness * waveY[i] - waveVel[i] * WaveDampening;
-                waveVel[i] = waveVel[i] + a;
-
-            }
-
-            for (int j = 0; j < 2; j++)
-            {
-                for (int i = 1; i < waveY.Length - 1; i++)
-                {
-                    leftDelta[i] = WaveSpread * (waveY[i] - waveY[i - 1]);
-                    waveVel[i - 1] = waveVel[i - 1] + leftDelta[i];
-
-                    rightDelta[i] = WaveSpread * (waveY[i] - waveY[i + 1]);
-                    waveVel[i + 1] = waveVel[i + 1] + rightDelta[i];
-                }
-
-                for (int i = 1; i < waveY.Length - 1; i++)
-                {
-                    waveY[i - 1] = waveY[i - 1] + leftDelta[i];
-                    waveY[i + 1] = waveY[i + 1] + rightDelta[i];
-                }
-            }
-
-            if (volume<FullVolume)
-            {
-                LethalPressure -= 0.5f;
-                if (Volume == 0.0f)
-                {
-                    for (int i = 1; i < waveY.Length - 1; i++)
-                    {
-                        if (waveY[i] > 0.1f) return;
-                    }
-                    update = false;
-                }
-            }
-            else
-            {
-                LethalPressure += 1.0f;
-            }
-
-
-        }
-
-        public override void Draw(SpriteBatch spriteBatch, bool editing)
-        {
-            if (!editing && !Game1.DebugDraw) return;
-
-            GUI.DrawRectangle(spriteBatch,
-                new Vector2(rect.X, -rect.Y),
-                new Vector2(rect.Width, rect.Height),
-                isHighlighted ? Color.Green : Color.Blue);
-
-            GUI.DrawRectangle(spriteBatch,
-                new Rectangle(rect.X, -rect.Y, rect.Width, rect.Height),
-                Color.Red*((100.0f-OxygenPercentage)/400.0f), true);
-
-            spriteBatch.DrawString(GUI.Font, "Pressure: " + ((int)pressure - rect.Y).ToString() +
-                " - Lethality: " + lethalPressure +
-                " - Oxygen: "+((int)OxygenPercentage), new Vector2(rect.X+10, -rect.Y+10), Color.Black);
-            spriteBatch.DrawString(GUI.Font, volume +" / "+ FullVolume, new Vector2(rect.X+10, -rect.Y+30), Color.Black);
-
-            if (isSelected && editing)
-            {
-                GUI.DrawRectangle(spriteBatch,
-                    new Vector2(rect.X - 5, -rect.Y - 5),
-                    new Vector2(rect.Width + 10, rect.Height + 10),
-                    Color.Red);
-            }
-        }
-
-        public void Render(GraphicsDevice graphicsDevice, Camera cam)
-        {
-            if (renderer.positionInBuffer > renderer.vertices.Length - 6) return;
-
-            //calculate where the surface should be based on the water volume
-            float top = rect.Y;
-            float bottom = rect.Y - rect.Height;
-            float surfaceY = bottom + Volume / rect.Width;
-
-            //interpolate the position of the rendered surface towards the "target surface"
-            surface = surface + (surfaceY - surface) / 10.0f;
-
-            Matrix transform =
-                cam.Transform
-                * Matrix.CreateOrthographic(Game1.GraphicsWidth, Game1.GraphicsHeight, -1, 1) * 0.5f;
-
-            if (bottom > cam.WorldView.Y || top < cam.WorldView.Y - cam.WorldView.Height) return;
-
-            if (!update)
-            {
-                // create the four corners of our triangle.
-                Vector3 p1 = new Vector3(rect.X, top, 0.0f);
-                Vector3 p2 = new Vector3(rect.X + rect.Width, top, 0.0f);
-
-                Vector3 p3 = new Vector3(p2.X, bottom, 0.0f);
-                Vector3 p4 = new Vector3(p1.X, bottom, 0.0f);
-
-                renderer.vertices[renderer.positionInBuffer] = new WaterVertex(p1, new Vector2(p1.X, -p1.Y), transform);
-                renderer.vertices[renderer.positionInBuffer + 1] = new WaterVertex(p2, new Vector2(p2.X, -p2.Y), transform);
-                renderer.vertices[renderer.positionInBuffer + 2] = new WaterVertex(p3, new Vector2(p3.X, -p3.Y), transform);
-
-                renderer.vertices[renderer.positionInBuffer + 3] = new WaterVertex(p1, new Vector2(p1.X, -p1.Y), transform);
-                renderer.vertices[renderer.positionInBuffer + 4] = new WaterVertex(p3, new Vector2(p3.X, -p3.Y), transform);
-                renderer.vertices[renderer.positionInBuffer + 5] = new WaterVertex(p4, new Vector2(p4.X, -p4.Y), transform);
-
-                renderer.positionInBuffer += 6;
-
-                return;
-            }
-
-            int x = rect.X;
-            int start = (int)Math.Floor((float)(cam.WorldView.X - x) / WaveWidth);
-            start = Math.Max(start, 0);
-
-            int end = (waveY.Length - 1)
-                - (int)Math.Floor((float)((x + rect.Width) - (cam.WorldView.X + cam.WorldView.Width)) / WaveWidth);
-            end = Math.Min(end, waveY.Length - 1);
-
-            x += start * WaveWidth;
-            
-            for (int i = start; i < end; i++)
-            {
-                if (renderer.positionInBuffer > renderer.vertices.Length - 6) return;
-
-                Vector3 p1 = new Vector3(x, top, 0.0f);
-                Vector3 p4 = new Vector3(p1.X, surface + waveY[i], 0.0f);
-
-                //skip adjacent "water rects" if the surface of the water is roughly at the same position
-                int width = WaveWidth;
-                while (i<end-1 && Math.Abs(waveY[i + 1] - waveY[i]) < 1.0f)
-                {
-                    width += WaveWidth;
-                    i++;
-                }
-
-                Vector3 p2 = new Vector3(x + width, top, 0.0f);
-                Vector3 p3 = new Vector3(p2.X, surface + waveY[i+1], 0.0f);
-                
-                renderer.vertices[renderer.positionInBuffer] = new WaterVertex(p1, new Vector2(p1.X, -p1.Y), transform);
-                renderer.vertices[renderer.positionInBuffer + 1] = new WaterVertex(p2, new Vector2(p2.X, -p2.Y), transform);
-                renderer.vertices[renderer.positionInBuffer + 2] = new WaterVertex(p3, new Vector2(p3.X, -p3.Y), transform);
-
-                renderer.vertices[renderer.positionInBuffer + 3] = new WaterVertex(p1, new Vector2(p1.X, -p1.Y), transform);
-                renderer.vertices[renderer.positionInBuffer + 4] = new WaterVertex(p3, new Vector2(p3.X, -p3.Y), transform);
-                renderer.vertices[renderer.positionInBuffer + 5] = new WaterVertex(p4, new Vector2(p4.X, -p4.Y), transform);
-
-                renderer.positionInBuffer += 6;
-
-                x += width;
-            }           
-
-        }
-
-        //returns the water block which contains the point (or null if it isn't inside any)
-        public static Hull FindHull(Vector2 position, Hull guess = null)
-        {
-            if (guess != null && hullList.Contains(guess))
-            {
-                if (Submarine.RectContains(guess.rect, position)) return guess;
-            }
-
-            foreach (Hull w in hullList)
-            {
-                if (Submarine.RectContains(w.rect, position)) return w;
-            }
-
-            return null;
-        }
-
-        public override XElement Save(XDocument doc)
-        {
-            XElement element = new XElement("Hull");
-
-            element.Add(new XAttribute("ID", ID),
-                new XAttribute("x", rect.X),
-                new XAttribute("y", rect.Y),
-                new XAttribute("width", rect.Width),
-                new XAttribute("height", rect.Height),
-                new XAttribute("water", volume));
-            
-            doc.Root.Add(element);
-
-            return element;
-        }
-
-        public static void Load(XElement element)
-        {
-            Rectangle rect = new Rectangle(
-                int.Parse(element.Attribute("x").Value),
-                int.Parse(element.Attribute("y").Value),
-                int.Parse(element.Attribute("width").Value),
-                int.Parse(element.Attribute("height").Value));
-
-            Hull h = new Hull(rect);
-
-            h.volume = ToolBox.GetAttributeFloat(element, "pressure", 0.0f);
-
-            h.ID = int.Parse(element.Attribute("ID").Value);
-        }
-    
-
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Xml.Linq;
+using FarseerPhysics;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+
+namespace Subsurface
+{
+
+    class Hull : MapEntity
+    {
+        public static List<Hull> hullList = new List<Hull>();
+
+        public static bool EditWater;
+
+        public static WaterRenderer renderer;
+        
+        public const float OxygenDistributionSpeed = 500.0f;
+        public const float OxygenDetoriationSpeed = 0.3f;
+        public const float OxygenConsumptionSpeed = 1000.0f;
+
+        public const int WaveWidth = 16;
+        const float WaveStiffness = 0.003f;
+        const float WaveSpread = 0.05f;
+        const float WaveDampening = 0.01f;
+
+        //how much excess water the room can contain  (= more than the volume of the room)
+        public const float MaxCompress = 10000f;
+        
+        public readonly Dictionary<string, PropertyDescriptor> properties;
+
+        private float lethalPressure;
+
+        private float surface;
+        private float volume;
+        private float pressure;
+
+        private float oxygen;
+
+        private bool update;
+
+        float[] waveY; //displacement from the surface of the water
+        float[] waveVel; //velocity of the point
+
+        float[] leftDelta;
+        float[] rightDelta;
+
+        public override bool IsLinkable
+        {
+            get { return true; }
+        }
+
+        public float LethalPressure
+        {
+            get { return lethalPressure; }
+            set { lethalPressure = MathHelper.Clamp(value, 0.0f, 100.0f); }
+        }
+
+        public Vector2 Size
+        {
+            get { return new Vector2(rect.Width, rect.Height); }
+        }
+
+        public float Surface
+        {
+            get { return surface; }
+        }
+
+        public float Volume
+        {
+            get { return volume; }
+            set
+            {               
+                volume = MathHelper.Clamp(value, 0.0f, FullVolume + MaxCompress);
+                if (volume < FullVolume) Pressure = rect.Y - rect.Height + volume / rect.Width;
+                if (volume > 0.0f) update = true;
+            }
+        }
+
+        [HasDefaultValue(90.0f, true)]
+        public float Oxygen
+        {
+            get { return oxygen; }
+            set { oxygen = MathHelper.Clamp(value, 0.0f, FullVolume); }
+        }
+
+        public float OxygenPercentage
+        {
+            get { return oxygen / FullVolume * 100.0f; }
+            set { Oxygen = (value / 100.0f) * FullVolume; }
+        }
+
+        public float FullVolume
+        {
+            get { return (rect.Width * rect.Height); }
+        }
+
+        public float Pressure
+        {
+            get { return pressure; }
+            set { pressure = value; }
+        }
+
+        public float[] WaveY
+        {
+            get { return waveY; }
+        }
+
+        public float[] WaveVel
+        {
+            get { return waveVel; }
+        }
+
+        public Hull(Rectangle rectangle)
+        {
+            rect = rectangle;
+            
+            OxygenPercentage = Rand.Range(90.0f, 100.0f, false);
+
+            properties = TypeDescriptor.GetProperties(GetType())
+                .Cast<PropertyDescriptor>()
+                .ToDictionary(pr => pr.Name);
+
+            int arraySize = (rectangle.Width / WaveWidth + 1);
+            waveY = new float[arraySize];
+            waveVel = new float[arraySize];
+
+            leftDelta = new float[arraySize];
+            rightDelta = new float[arraySize];
+
+            surface = rect.Y - rect.Height;
+
+            aiTarget = new AITarget(this);
+            aiTarget.SightRange = (rect.Width + rect.Height)*10.0f;
+
+            hullList.Add(this);
+
+            Item.UpdateHulls();
+            Gap.UpdateHulls();
+
+            Volume = 0.0f;
+
+            //add to list of entities as well
+            mapEntityList.Add(this);
+        }
+
+        public override bool Contains(Vector2 position)
+        {
+            return (Submarine.RectContains(rect, position) &&
+                !Submarine.RectContains(new Rectangle(rect.X + 8, rect.Y - 8, rect.Width - 16, rect.Height - 16), position));
+        }
+
+        public int GetWaveIndex(Vector2 position)
+        {
+            int index = (int)(position.X - rect.X) / WaveWidth;
+            index = MathHelper.Clamp(index, 0, waveY.Length-1);
+            return index;
+        }
+
+        public override void Move(Vector2 amount)
+        {
+            rect.X += (int)amount.X;
+            rect.Y += (int)amount.Y;
+
+            Item.UpdateHulls();
+            Gap.UpdateHulls();
+        }
+
+        public override void Remove()
+        {
+            base.Remove();
+
+            Item.UpdateHulls();
+            Gap.UpdateHulls();
+
+            //renderer.Dispose();
+
+            hullList.Remove(this);
+        }
+
+        public override void Update(Camera cam, float deltaTime)
+        {
+            Oxygen -= OxygenDetoriationSpeed * deltaTime;
+
+            if (EditWater)
+            {
+                Vector2 position = cam.ScreenToWorld(PlayerInput.MousePosition);
+                if (Submarine.RectContains(rect, position))
+                {
+                    if (PlayerInput.LeftButtonDown())
+                    {
+                        waveY[(int)(position.X - rect.X) / WaveWidth] = 100.0f;
+                        Volume = Volume + 1500.0f;
+                    }
+                    else if (PlayerInput.GetMouseState.RightButton == Microsoft.Xna.Framework.Input.ButtonState.Pressed)
+                    {
+                        Volume = Volume - 1500.0f;
+                    }
+                }
+            }
+
+
+            if (!update) return;
+
+            float surfaceY = rect.Y - rect.Height + Volume / rect.Width;
+            for (int i = 0; i < waveY.Length; i++)
+            {
+                float maxDelta = Math.Max(Math.Abs(rightDelta[i]), Math.Abs(leftDelta[i]));
+                if (maxDelta > Rand.Range(0.2f,10.0f))
+                {
+                    Game1.ParticleManager.CreateParticle("mist",
+                        ConvertUnits.ToSimUnits(new Vector2(rect.X + WaveWidth * i,surface + waveY[i])),
+                        new Vector2(0.0f, -0.5f));
+                }
+
+                waveY[i] = waveY[i] + waveVel[i];
+
+                if (surfaceY + waveY[i] > rect.Y)
+                {
+                    waveY[i] -= (surfaceY + waveY[i]) - rect.Y;
+                    waveVel[i] = waveVel[i] * -0.5f;
+                }
+                else if (surfaceY + waveY[i] < rect.Y - rect.Height)
+                {
+                    waveY[i] -= (surfaceY + waveY[i]) - (rect.Y - rect.Height);
+                    waveVel[i] = waveVel[i] * -0.5f;
+                }
+
+
+                //acceleration
+                float a = -WaveStiffness * waveY[i] - waveVel[i] * WaveDampening;
+                waveVel[i] = waveVel[i] + a;
+
+            }
+
+            for (int j = 0; j < 2; j++)
+            {
+                for (int i = 1; i < waveY.Length - 1; i++)
+                {
+                    leftDelta[i] = WaveSpread * (waveY[i] - waveY[i - 1]);
+                    waveVel[i - 1] = waveVel[i - 1] + leftDelta[i];
+
+                    rightDelta[i] = WaveSpread * (waveY[i] - waveY[i + 1]);
+                    waveVel[i + 1] = waveVel[i + 1] + rightDelta[i];
+                }
+
+                for (int i = 1; i < waveY.Length - 1; i++)
+                {
+                    waveY[i - 1] = waveY[i - 1] + leftDelta[i];
+                    waveY[i + 1] = waveY[i + 1] + rightDelta[i];
+                }
+            }
+
+            if (volume<FullVolume)
+            {
+                LethalPressure -= 0.5f;
+                if (Volume == 0.0f)
+                {
+                    for (int i = 1; i < waveY.Length - 1; i++)
+                    {
+                        if (waveY[i] > 0.1f) return;
+                    }
+                    update = false;
+                }
+            }
+            else
+            {
+                LethalPressure += 1.0f;
+            }
+
+
+        }
+
+        public override void Draw(SpriteBatch spriteBatch, bool editing)
+        {
+            if (!editing && !Game1.DebugDraw) return;
+
+            GUI.DrawRectangle(spriteBatch,
+                new Vector2(rect.X, -rect.Y),
+                new Vector2(rect.Width, rect.Height),
+                isHighlighted ? Color.Green : Color.Blue);
+
+            GUI.DrawRectangle(spriteBatch,
+                new Rectangle(rect.X, -rect.Y, rect.Width, rect.Height),
+                Color.Red*((100.0f-OxygenPercentage)/400.0f), true);
+
+            spriteBatch.DrawString(GUI.Font, "Pressure: " + ((int)pressure - rect.Y).ToString() +
+                " - Lethality: " + lethalPressure +
+                " - Oxygen: "+((int)OxygenPercentage), new Vector2(rect.X+10, -rect.Y+10), Color.Black);
+            spriteBatch.DrawString(GUI.Font, volume +" / "+ FullVolume, new Vector2(rect.X+10, -rect.Y+30), Color.Black);
+
+            if (isSelected && editing)
+            {
+                GUI.DrawRectangle(spriteBatch,
+                    new Vector2(rect.X - 5, -rect.Y - 5),
+                    new Vector2(rect.Width + 10, rect.Height + 10),
+                    Color.Red);
+            }
+        }
+
+        public void Render(GraphicsDevice graphicsDevice, Camera cam)
+        {
+            if (renderer.positionInBuffer > renderer.vertices.Length - 6) return;
+
+            //calculate where the surface should be based on the water volume
+            float top = rect.Y;
+            float bottom = rect.Y - rect.Height;
+            float surfaceY = bottom + Volume / rect.Width;
+
+            //interpolate the position of the rendered surface towards the "target surface"
+            surface = surface + (surfaceY - surface) / 10.0f;
+
+            Matrix transform =
+                cam.Transform
+                * Matrix.CreateOrthographic(Game1.GraphicsWidth, Game1.GraphicsHeight, -1, 1) * 0.5f;
+
+            if (bottom > cam.WorldView.Y || top < cam.WorldView.Y - cam.WorldView.Height) return;
+
+            if (!update)
+            {
+                // create the four corners of our triangle.
+                Vector3 p1 = new Vector3(rect.X, top, 0.0f);
+                Vector3 p2 = new Vector3(rect.X + rect.Width, top, 0.0f);
+
+                Vector3 p3 = new Vector3(p2.X, bottom, 0.0f);
+                Vector3 p4 = new Vector3(p1.X, bottom, 0.0f);
+
+                renderer.vertices[renderer.positionInBuffer] = new WaterVertex(p1, new Vector2(p1.X, -p1.Y), transform);
+                renderer.vertices[renderer.positionInBuffer + 1] = new WaterVertex(p2, new Vector2(p2.X, -p2.Y), transform);
+                renderer.vertices[renderer.positionInBuffer + 2] = new WaterVertex(p3, new Vector2(p3.X, -p3.Y), transform);
+
+                renderer.vertices[renderer.positionInBuffer + 3] = new WaterVertex(p1, new Vector2(p1.X, -p1.Y), transform);
+                renderer.vertices[renderer.positionInBuffer + 4] = new WaterVertex(p3, new Vector2(p3.X, -p3.Y), transform);
+                renderer.vertices[renderer.positionInBuffer + 5] = new WaterVertex(p4, new Vector2(p4.X, -p4.Y), transform);
+
+                renderer.positionInBuffer += 6;
+
+                return;
+            }
+
+            int x = rect.X;
+            int start = (int)Math.Floor((float)(cam.WorldView.X - x) / WaveWidth);
+            start = Math.Max(start, 0);
+
+            int end = (waveY.Length - 1)
+                - (int)Math.Floor((float)((x + rect.Width) - (cam.WorldView.X + cam.WorldView.Width)) / WaveWidth);
+            end = Math.Min(end, waveY.Length - 1);
+
+            x += start * WaveWidth;
+            
+            for (int i = start; i < end; i++)
+            {
+                if (renderer.positionInBuffer > renderer.vertices.Length - 6) return;
+
+                Vector3 p1 = new Vector3(x, top, 0.0f);
+                Vector3 p4 = new Vector3(p1.X, surface + waveY[i], 0.0f);
+
+                //skip adjacent "water rects" if the surface of the water is roughly at the same position
+                int width = WaveWidth;
+                while (i<end-1 && Math.Abs(waveY[i + 1] - waveY[i]) < 1.0f)
+                {
+                    width += WaveWidth;
+                    i++;
+                }
+
+                Vector3 p2 = new Vector3(x + width, top, 0.0f);
+                Vector3 p3 = new Vector3(p2.X, surface + waveY[i+1], 0.0f);
+                
+                renderer.vertices[renderer.positionInBuffer] = new WaterVertex(p1, new Vector2(p1.X, -p1.Y), transform);
+                renderer.vertices[renderer.positionInBuffer + 1] = new WaterVertex(p2, new Vector2(p2.X, -p2.Y), transform);
+                renderer.vertices[renderer.positionInBuffer + 2] = new WaterVertex(p3, new Vector2(p3.X, -p3.Y), transform);
+
+                renderer.vertices[renderer.positionInBuffer + 3] = new WaterVertex(p1, new Vector2(p1.X, -p1.Y), transform);
+                renderer.vertices[renderer.positionInBuffer + 4] = new WaterVertex(p3, new Vector2(p3.X, -p3.Y), transform);
+                renderer.vertices[renderer.positionInBuffer + 5] = new WaterVertex(p4, new Vector2(p4.X, -p4.Y), transform);
+
+                renderer.positionInBuffer += 6;
+
+                x += width;
+            }           
+
+        }
+
+        //returns the water block which contains the point (or null if it isn't inside any)
+        public static Hull FindHull(Vector2 position, Hull guess = null)
+        {
+            if (guess != null && hullList.Contains(guess))
+            {
+                if (Submarine.RectContains(guess.rect, position)) return guess;
+            }
+
+            foreach (Hull w in hullList)
+            {
+                if (Submarine.RectContains(w.rect, position)) return w;
+            }
+
+            return null;
+        }
+
+        public override XElement Save(XDocument doc)
+        {
+            XElement element = new XElement("Hull");
+
+            element.Add(new XAttribute("ID", ID),
+                new XAttribute("x", rect.X),
+                new XAttribute("y", rect.Y),
+                new XAttribute("width", rect.Width),
+                new XAttribute("height", rect.Height),
+                new XAttribute("water", volume));
+            
+            doc.Root.Add(element);
+
+            return element;
+        }
+
+        public static void Load(XElement element)
+        {
+            Rectangle rect = new Rectangle(
+                int.Parse(element.Attribute("x").Value),
+                int.Parse(element.Attribute("y").Value),
+                int.Parse(element.Attribute("width").Value),
+                int.Parse(element.Attribute("height").Value));
+
+            Hull h = new Hull(rect);
+
+            h.volume = ToolBox.GetAttributeFloat(element, "pressure", 0.0f);
+
+            h.ID = int.Parse(element.Attribute("ID").Value);
+        }
+    
+
+    }
+}
diff --git a/Subsurface/Map/IDamageable.cs b/Subsurface/Source/Map/IDamageable.cs
similarity index 100%
rename from Subsurface/Map/IDamageable.cs
rename to Subsurface/Source/Map/IDamageable.cs
diff --git a/Subsurface/Map/Levels/Level.cs b/Subsurface/Source/Map/Levels/Level.cs
similarity index 97%
rename from Subsurface/Map/Levels/Level.cs
rename to Subsurface/Source/Map/Levels/Level.cs
index 0c6677feb..4ce5ff929 100644
--- a/Subsurface/Map/Levels/Level.cs
+++ b/Subsurface/Source/Map/Levels/Level.cs
@@ -318,24 +318,24 @@ namespace Subsurface
 
             startPosition.Y = borders.Height;
             endPosition.Y = borders.Height;
-            for (int i = 0; i < 2; i++)
-            {
-                Vector2 tunnelStart = (i == 0) ? startPosition : endPosition;
+            //for (int i = 0; i < 2; i++)
+            //{
+            //    Vector2 tunnelStart = (i == 0) ? startPosition : endPosition;
 
-                for (int n = -1; n < 2; n += 2)
-                {
-                    int cellIndex = FindCellIndex(new Vector2(tunnelStart.X + minWidth * 0.5f * n, tunnelStart.Y), 3);
+            //    for (int n = -1; n < 2; n += 2)
+            //    {
+            //        int cellIndex = FindCellIndex(new Vector2(tunnelStart.X + minWidth * 0.5f * n, tunnelStart.Y), 3);
 
-                    foreach (GraphEdge ge in cells[cellIndex].edges)
-                    {
-                        if (ge.point1.Y > cells[cellIndex].Center.Y) ge.point1.Y = borders.Height + shaftHeight;
-                        if (ge.point2.Y > cells[cellIndex].Center.Y) ge.point2.Y = borders.Height + shaftHeight;
-                    }
-                }
-            }
+            //        foreach (GraphEdge ge in cells[cellIndex].edges)
+            //        {
+            //            if (ge.point1.Y > cells[cellIndex].Center.Y) ge.point1.Y = borders.Height + shaftHeight;
+            //            if (ge.point2.Y > cells[cellIndex].Center.Y) ge.point2.Y = borders.Height + shaftHeight;
+            //        }
+            //    }
+            //}
 
-            startPosition.Y += shaftHeight;
-            endPosition.Y += shaftHeight;
+            //startPosition.Y += shaftHeight;
+            //endPosition.Y += shaftHeight;
 
             GeneratePolygons(cells, pathCells);
 
diff --git a/Subsurface/Map/Levels/Voronoi.cs b/Subsurface/Source/Map/Levels/Voronoi.cs
similarity index 100%
rename from Subsurface/Map/Levels/Voronoi.cs
rename to Subsurface/Source/Map/Levels/Voronoi.cs
diff --git a/Subsurface/Map/Levels/VoronoiElements.cs b/Subsurface/Source/Map/Levels/VoronoiElements.cs
similarity index 100%
rename from Subsurface/Map/Levels/VoronoiElements.cs
rename to Subsurface/Source/Map/Levels/VoronoiElements.cs
diff --git a/Subsurface/Map/Lights/ConvexHull.cs b/Subsurface/Source/Map/Lights/ConvexHull.cs
similarity index 97%
rename from Subsurface/Map/Lights/ConvexHull.cs
rename to Subsurface/Source/Map/Lights/ConvexHull.cs
index 3e8adea71..f114ee999 100644
--- a/Subsurface/Map/Lights/ConvexHull.cs
+++ b/Subsurface/Source/Map/Lights/ConvexHull.cs
@@ -1,243 +1,243 @@
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Subsurface.Lights
-{
-    class ConvexHull
-    {
-        public static List<ConvexHull> list = new List<ConvexHull>();
-        static BasicEffect losEffect;
-        static BasicEffect shadowEffect;
-        
-        private VertexPositionColor[] vertices;
-        private short[] indices;
-        int primitiveCount;
-
-        bool[] backFacing;
-        VertexPositionColor[] shadowVertices;
-        
-        public bool Enabled
-        {
-            get;
-            set;
-        }
-        
-        public ConvexHull(Vector2[] points, Color color)
-        {
-            int vertexCount = points.Length;
-            vertices = new VertexPositionColor[vertexCount + 1];
-            Vector2 center = Vector2.Zero;
-
-            for (int i = 0; i < vertexCount; i++)
-            {
-                vertices[i] = new VertexPositionColor(new Vector3(points[i], 0), color);
-                center += points[i];
-            }
-            center /= points.Length;
-            vertices[vertexCount] = new VertexPositionColor(new Vector3(center, 0), color);
-
-            primitiveCount = points.Length;
-            indices = new short[primitiveCount * 3];
-
-            for (int i = 0; i < primitiveCount; i++)
-            {
-                indices[3 * i] = (short)i;
-                indices[3 * i + 1] = (short)((i + 1) % vertexCount);
-                indices[3 * i + 2] = (short)vertexCount;
-            }
-            backFacing = new bool[vertexCount];
-            
-            Enabled = true;
-
-            list.Add(this);
-        }
-
-        public void Move(Vector2 amount)
-        {
-            for (int i = 0; i < vertices.Count(); i++)
-            {
-                vertices[i].Position = new Vector3(vertices[i].Position.X + amount.X, vertices[i].Position.Y + amount.Y, vertices[i].Position.Z);
-            }
-        }
-
-        public void SetVertices(Vector2[] points)
-        {
-            int vertexCount = points.Length;
-            vertices = new VertexPositionColor[vertexCount + 1];
-
-            for (int i = 0; i < vertexCount; i++)
-            {
-                vertices[i] = new VertexPositionColor(new Vector3(points[i], 0), Color.Black);
-            }
-        }
-
-        //public void Draw(GameTime gameTime)
-        //{
-        //    device.RasterizerState = RasterizerState.CullNone;
-        //    device.BlendState = BlendState.Opaque;
-
-        //    drawingEffect.World = Matrix.CreateTranslation(position.X, position.Y, 0);
-
-        //    foreach (EffectPass pass in drawingEffect.CurrentTechnique.Passes)
-        //    {
-        //        pass.Apply();
-        //        device.DrawUserIndexedPrimitives<VertexPositionColor>(PrimitiveType.TriangleList, vertices, 0, vertices.Length, indices, 0, primitiveCount);
-        //    }
-        //}
-
-        public void DrawShadows(GraphicsDevice graphicsDevice, Camera cam, Vector2 lightSourcePos, bool los = true)
-        {
-            if (!Enabled) return;
-
-            if (losEffect == null)
-            {
-                losEffect = new BasicEffect(graphicsDevice);
-                losEffect.VertexColorEnabled = true;
-            }
-            if (shadowEffect==null)
-            {
-                shadowEffect = new BasicEffect(graphicsDevice);
-                shadowEffect.TextureEnabled = true;
-                //shadowEffect.VertexColorEnabled = true;
-                shadowEffect.LightingEnabled = false;
-                shadowEffect.Texture = Game1.TextureLoader.FromFile("Content/lights/penumbra.png");
-            }
-            
-            //compute facing of each edge, using N*L
-            for (int i = 0; i < primitiveCount; i++)
-            {
-                Vector2 firstVertex = new Vector2(vertices[i].Position.X, vertices[i].Position.Y);
-                int secondIndex = (i + 1) % primitiveCount;
-                Vector2 secondVertex = new Vector2(vertices[secondIndex].Position.X, vertices[secondIndex].Position.Y);
-                Vector2 middle = (firstVertex + secondVertex) / 2;
-
-                Vector2 L = lightSourcePos - middle;
-
-                Vector2 N = new Vector2();
-                N.X = -(secondVertex.Y - firstVertex.Y);
-                N.Y = secondVertex.X - firstVertex.X;
-
-                backFacing[i] = (Vector2.Dot(N, L) < 0);
-            }
-
-            //find beginning and ending vertices which
-            //belong to the shadow
-            int startingIndex = 0;
-            int endingIndex = 0;
-            for (int i = 0; i < primitiveCount; i++)
-            {
-                int currentEdge = i;
-                int nextEdge = (i + 1) % primitiveCount;
-
-                if (backFacing[currentEdge] && !backFacing[nextEdge])
-                    endingIndex = nextEdge;
-
-                if (!backFacing[currentEdge] && backFacing[nextEdge])
-                    startingIndex = nextEdge;
-            }
-
-            VertexPositionTexture[] penumbraVertices = new VertexPositionTexture[6];
-
-            if (los)
-            {
-                for (int n = 0; n < 4; n+=3)
-                {
-                    Vector3 penumbraStart = (n == 0) ? vertices[startingIndex].Position : vertices[endingIndex].Position;
-
-                    penumbraVertices[n] = new VertexPositionTexture();
-                    penumbraVertices[n].Position = penumbraStart;
-                    penumbraVertices[n].TextureCoordinate = new Vector2(0.0f, 1.0f);
-                    //penumbraVertices[0].te = fow ? Color.Black : Color.Transparent;
-
-                    for (int i = 0; i < 2; i++ )
-                    {
-                        penumbraVertices[n + i + 1] = new VertexPositionTexture();
-                        Vector3 vertexDir = penumbraStart - new Vector3(lightSourcePos, 0);
-                        vertexDir.Normalize();
-
-                        Vector3 normal = (i == 0) ? new Vector3(-vertexDir.Y, vertexDir.X, 0.0f) : new Vector3(vertexDir.Y, -vertexDir.X, 0.0f)*0.05f;
-                        if (n > 0) normal = -normal;
-                        vertexDir = penumbraStart - (new Vector3(lightSourcePos, 0) - normal * 20.0f);
-                        vertexDir.Normalize();
-                        penumbraVertices[n + i + 1].Position = new Vector3(lightSourcePos, 0) + vertexDir * 9000;
-                        
-                        if (los)
-                        {
-                            penumbraVertices[n + i + 1].TextureCoordinate = (i == 0) ? new Vector2(0.05f, 0.0f) : new Vector2(1.0f, 0.0f);
-                        }
-                        else
-                        {
-                            penumbraVertices[n + i + 1].TextureCoordinate = (i == 0) ? new Vector2(1.0f, 0.0f) : Vector2.Zero;
-                        }
-                    }
-
-                    if (n > 0)
-                    {
-                        var temp = penumbraVertices[4];
-                        penumbraVertices[4] = penumbraVertices[5];
-                        penumbraVertices[5] = temp;
-                    }
-                }
-            }  
-                
-
-            int shadowVertexCount;
-
-            //nr of vertices that are in the shadow
-            if (endingIndex > startingIndex)
-                shadowVertexCount = endingIndex - startingIndex + 1;
-            else
-                shadowVertexCount = primitiveCount + 1 - startingIndex + endingIndex;
-
-            shadowVertices = new VertexPositionColor[shadowVertexCount * 2];
-
-            //create a triangle strip that has the shape of the shadow
-            int currentIndex = startingIndex;
-            int svCount = 0;
-            while (svCount != shadowVertexCount * 2)
-            {
-                Vector3 vertexPos = vertices[currentIndex].Position;
-
-                //one vertex on the hull
-                shadowVertices[svCount] = new VertexPositionColor();
-                shadowVertices[svCount].Color = los ? Color.Black : Color.Transparent;
-                shadowVertices[svCount].Position = vertexPos;
-
-                //one extruded by the light direction
-                shadowVertices[svCount + 1] = new VertexPositionColor();
-                shadowVertices[svCount + 1].Color = los ? Color.Black : Color.Transparent;
-                Vector3 L2P = vertexPos - new Vector3(lightSourcePos, 0);
-                L2P.Normalize();
-                shadowVertices[svCount + 1].Position = new Vector3(lightSourcePos, 0) + L2P * 9000;
-
-                svCount += 2;
-                currentIndex = (currentIndex + 1) % primitiveCount;
-            }
-
-            losEffect.World = cam.ShaderTransform
-                * Matrix.CreateOrthographic(Game1.GraphicsWidth, Game1.GraphicsHeight, -1, 1) * 0.5f;
-            losEffect.CurrentTechnique.Passes[0].Apply();
-
-            graphicsDevice.DrawUserPrimitives<VertexPositionColor>(PrimitiveType.TriangleStrip, shadowVertices, 0, shadowVertexCount * 2 - 2);
-
-            if (los)
-            {
-                shadowEffect.World = cam.ShaderTransform
-                    * Matrix.CreateOrthographic(Game1.GraphicsWidth, Game1.GraphicsHeight, -1, 1) * 0.5f;
-                shadowEffect.CurrentTechnique.Passes[0].Apply();
-
-                graphicsDevice.DrawUserPrimitives<VertexPositionTexture>(PrimitiveType.TriangleList, penumbraVertices, 0, 2, VertexPositionTexture.VertexDeclaration);
-            }
-        }
-
-        public void Remove()
-        {
-            list.Remove(this);
-        }
-
-
-    }
-
-}
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Subsurface.Lights
+{
+    class ConvexHull
+    {
+        public static List<ConvexHull> list = new List<ConvexHull>();
+        static BasicEffect losEffect;
+        static BasicEffect shadowEffect;
+        
+        private VertexPositionColor[] vertices;
+        private short[] indices;
+        int primitiveCount;
+
+        bool[] backFacing;
+        VertexPositionColor[] shadowVertices;
+        
+        public bool Enabled
+        {
+            get;
+            set;
+        }
+        
+        public ConvexHull(Vector2[] points, Color color)
+        {
+            int vertexCount = points.Length;
+            vertices = new VertexPositionColor[vertexCount + 1];
+            Vector2 center = Vector2.Zero;
+
+            for (int i = 0; i < vertexCount; i++)
+            {
+                vertices[i] = new VertexPositionColor(new Vector3(points[i], 0), color);
+                center += points[i];
+            }
+            center /= points.Length;
+            vertices[vertexCount] = new VertexPositionColor(new Vector3(center, 0), color);
+
+            primitiveCount = points.Length;
+            indices = new short[primitiveCount * 3];
+
+            for (int i = 0; i < primitiveCount; i++)
+            {
+                indices[3 * i] = (short)i;
+                indices[3 * i + 1] = (short)((i + 1) % vertexCount);
+                indices[3 * i + 2] = (short)vertexCount;
+            }
+            backFacing = new bool[vertexCount];
+            
+            Enabled = true;
+
+            list.Add(this);
+        }
+
+        public void Move(Vector2 amount)
+        {
+            for (int i = 0; i < vertices.Count(); i++)
+            {
+                vertices[i].Position = new Vector3(vertices[i].Position.X + amount.X, vertices[i].Position.Y + amount.Y, vertices[i].Position.Z);
+            }
+        }
+
+        public void SetVertices(Vector2[] points)
+        {
+            int vertexCount = points.Length;
+            vertices = new VertexPositionColor[vertexCount + 1];
+
+            for (int i = 0; i < vertexCount; i++)
+            {
+                vertices[i] = new VertexPositionColor(new Vector3(points[i], 0), Color.Black);
+            }
+        }
+
+        //public void Draw(GameTime gameTime)
+        //{
+        //    device.RasterizerState = RasterizerState.CullNone;
+        //    device.BlendState = BlendState.Opaque;
+
+        //    drawingEffect.World = Matrix.CreateTranslation(position.X, position.Y, 0);
+
+        //    foreach (EffectPass pass in drawingEffect.CurrentTechnique.Passes)
+        //    {
+        //        pass.Apply();
+        //        device.DrawUserIndexedPrimitives<VertexPositionColor>(PrimitiveType.TriangleList, vertices, 0, vertices.Length, indices, 0, primitiveCount);
+        //    }
+        //}
+
+        public void DrawShadows(GraphicsDevice graphicsDevice, Camera cam, Vector2 lightSourcePos, bool los = true)
+        {
+            if (!Enabled) return;
+
+            if (losEffect == null)
+            {
+                losEffect = new BasicEffect(graphicsDevice);
+                losEffect.VertexColorEnabled = true;
+            }
+            if (shadowEffect==null)
+            {
+                shadowEffect = new BasicEffect(graphicsDevice);
+                shadowEffect.TextureEnabled = true;
+                //shadowEffect.VertexColorEnabled = true;
+                shadowEffect.LightingEnabled = false;
+                shadowEffect.Texture = Game1.TextureLoader.FromFile("Content/lights/penumbra.png");
+            }
+            
+            //compute facing of each edge, using N*L
+            for (int i = 0; i < primitiveCount; i++)
+            {
+                Vector2 firstVertex = new Vector2(vertices[i].Position.X, vertices[i].Position.Y);
+                int secondIndex = (i + 1) % primitiveCount;
+                Vector2 secondVertex = new Vector2(vertices[secondIndex].Position.X, vertices[secondIndex].Position.Y);
+                Vector2 middle = (firstVertex + secondVertex) / 2;
+
+                Vector2 L = lightSourcePos - middle;
+
+                Vector2 N = new Vector2();
+                N.X = -(secondVertex.Y - firstVertex.Y);
+                N.Y = secondVertex.X - firstVertex.X;
+
+                backFacing[i] = (Vector2.Dot(N, L) < 0);
+            }
+
+            //find beginning and ending vertices which
+            //belong to the shadow
+            int startingIndex = 0;
+            int endingIndex = 0;
+            for (int i = 0; i < primitiveCount; i++)
+            {
+                int currentEdge = i;
+                int nextEdge = (i + 1) % primitiveCount;
+
+                if (backFacing[currentEdge] && !backFacing[nextEdge])
+                    endingIndex = nextEdge;
+
+                if (!backFacing[currentEdge] && backFacing[nextEdge])
+                    startingIndex = nextEdge;
+            }
+
+            VertexPositionTexture[] penumbraVertices = new VertexPositionTexture[6];
+
+            if (los)
+            {
+                for (int n = 0; n < 4; n+=3)
+                {
+                    Vector3 penumbraStart = (n == 0) ? vertices[startingIndex].Position : vertices[endingIndex].Position;
+
+                    penumbraVertices[n] = new VertexPositionTexture();
+                    penumbraVertices[n].Position = penumbraStart;
+                    penumbraVertices[n].TextureCoordinate = new Vector2(0.0f, 1.0f);
+                    //penumbraVertices[0].te = fow ? Color.Black : Color.Transparent;
+
+                    for (int i = 0; i < 2; i++ )
+                    {
+                        penumbraVertices[n + i + 1] = new VertexPositionTexture();
+                        Vector3 vertexDir = penumbraStart - new Vector3(lightSourcePos, 0);
+                        vertexDir.Normalize();
+
+                        Vector3 normal = (i == 0) ? new Vector3(-vertexDir.Y, vertexDir.X, 0.0f) : new Vector3(vertexDir.Y, -vertexDir.X, 0.0f)*0.05f;
+                        if (n > 0) normal = -normal;
+                        vertexDir = penumbraStart - (new Vector3(lightSourcePos, 0) - normal * 20.0f);
+                        vertexDir.Normalize();
+                        penumbraVertices[n + i + 1].Position = new Vector3(lightSourcePos, 0) + vertexDir * 9000;
+                        
+                        if (los)
+                        {
+                            penumbraVertices[n + i + 1].TextureCoordinate = (i == 0) ? new Vector2(0.05f, 0.0f) : new Vector2(1.0f, 0.0f);
+                        }
+                        else
+                        {
+                            penumbraVertices[n + i + 1].TextureCoordinate = (i == 0) ? new Vector2(1.0f, 0.0f) : Vector2.Zero;
+                        }
+                    }
+
+                    if (n > 0)
+                    {
+                        var temp = penumbraVertices[4];
+                        penumbraVertices[4] = penumbraVertices[5];
+                        penumbraVertices[5] = temp;
+                    }
+                }
+            }  
+                
+
+            int shadowVertexCount;
+
+            //nr of vertices that are in the shadow
+            if (endingIndex > startingIndex)
+                shadowVertexCount = endingIndex - startingIndex + 1;
+            else
+                shadowVertexCount = primitiveCount + 1 - startingIndex + endingIndex;
+
+            shadowVertices = new VertexPositionColor[shadowVertexCount * 2];
+
+            //create a triangle strip that has the shape of the shadow
+            int currentIndex = startingIndex;
+            int svCount = 0;
+            while (svCount != shadowVertexCount * 2)
+            {
+                Vector3 vertexPos = vertices[currentIndex].Position;
+
+                //one vertex on the hull
+                shadowVertices[svCount] = new VertexPositionColor();
+                shadowVertices[svCount].Color = los ? Color.Black : Color.Transparent;
+                shadowVertices[svCount].Position = vertexPos;
+
+                //one extruded by the light direction
+                shadowVertices[svCount + 1] = new VertexPositionColor();
+                shadowVertices[svCount + 1].Color = los ? Color.Black : Color.Transparent;
+                Vector3 L2P = vertexPos - new Vector3(lightSourcePos, 0);
+                L2P.Normalize();
+                shadowVertices[svCount + 1].Position = new Vector3(lightSourcePos, 0) + L2P * 9000;
+
+                svCount += 2;
+                currentIndex = (currentIndex + 1) % primitiveCount;
+            }
+
+            losEffect.World = cam.ShaderTransform
+                * Matrix.CreateOrthographic(Game1.GraphicsWidth, Game1.GraphicsHeight, -1, 1) * 0.5f;
+            losEffect.CurrentTechnique.Passes[0].Apply();
+
+            graphicsDevice.DrawUserPrimitives<VertexPositionColor>(PrimitiveType.TriangleStrip, shadowVertices, 0, shadowVertexCount * 2 - 2);
+
+            if (los)
+            {
+                shadowEffect.World = cam.ShaderTransform
+                    * Matrix.CreateOrthographic(Game1.GraphicsWidth, Game1.GraphicsHeight, -1, 1) * 0.5f;
+                shadowEffect.CurrentTechnique.Passes[0].Apply();
+
+                graphicsDevice.DrawUserPrimitives<VertexPositionTexture>(PrimitiveType.TriangleList, penumbraVertices, 0, 2, VertexPositionTexture.VertexDeclaration);
+            }
+        }
+
+        public void Remove()
+        {
+            list.Remove(this);
+        }
+
+
+    }
+
+}
diff --git a/Subsurface/Map/Lights/Light.cs b/Subsurface/Source/Map/Lights/Light.cs
similarity index 100%
rename from Subsurface/Map/Lights/Light.cs
rename to Subsurface/Source/Map/Lights/Light.cs
diff --git a/Subsurface/Map/Lights/LightManager.cs b/Subsurface/Source/Map/Lights/LightManager.cs
similarity index 100%
rename from Subsurface/Map/Lights/LightManager.cs
rename to Subsurface/Source/Map/Lights/LightManager.cs
diff --git a/Subsurface/Map/Location.cs b/Subsurface/Source/Map/Location.cs
similarity index 100%
rename from Subsurface/Map/Location.cs
rename to Subsurface/Source/Map/Location.cs
diff --git a/Subsurface/Map/LocationType.cs b/Subsurface/Source/Map/LocationType.cs
similarity index 95%
rename from Subsurface/Map/LocationType.cs
rename to Subsurface/Source/Map/LocationType.cs
index cd705c61f..31e267e9d 100644
--- a/Subsurface/Map/LocationType.cs
+++ b/Subsurface/Source/Map/LocationType.cs
@@ -58,7 +58,8 @@ namespace Subsurface
             }
 
             string spritePath = ToolBox.GetAttributeString(element, "symbol", "Content/Map/beaconSymbol.png");
-            sprite = new Sprite(spritePath, null, new Microsoft.Xna.Framework.Vector2(-32, -32));
+            sprite = new Sprite(spritePath, new Microsoft.Xna.Framework.Vector2(0.5f, 0.5f));
+            //sprite.Origin = ;
 
         }
 
diff --git a/Subsurface/Map/Map.cs b/Subsurface/Source/Map/Map.cs
similarity index 97%
rename from Subsurface/Map/Map.cs
rename to Subsurface/Source/Map/Map.cs
index a5552c7cf..953badbd7 100644
--- a/Subsurface/Map/Map.cs
+++ b/Subsurface/Source/Map/Map.cs
@@ -1,439 +1,441 @@
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Voronoi2;
-
-namespace Subsurface
-{
-    class Map
-    {
-        Vector2 difficultyIncrease = new Vector2(5.0f,10.0f);
-        Vector2 difficultyCutoff = new Vector2(80.0f, 100.0f);
-
-        private List<Level> levels;
-
-        private List<Location> locations;
-
-        private List<LocationConnection> connections;
-        
-        private string seed;
-        private int size;
-
-        private static Sprite iceTexture;
-        private static Texture2D iceCraters;
-        private static Texture2D iceCrack;
-
-        private Location currentLocation;
-        private Location selectedLocation;
-
-        private LocationConnection selectedConnection;
-
-        public Location CurrentLocation
-        {
-            get { return currentLocation; }
-        }
-
-        public int CurrentLocationIndex
-        {
-            get { return locations.IndexOf(currentLocation); }
-        }
-
-        public Location SelectedLocation
-        {
-            get { return selectedLocation; }
-        }
-
-        public LocationConnection SelectedConnection
-        {
-            get { return selectedConnection; }
-        }
-
-        public string Seed
-        {
-            get { return seed; }
-        }
-
-        public Map(string seed, int size)
-        {
-            this.seed = seed;
-
-            this.size = size;
-
-            levels = new List<Level>();
-
-            locations = new List<Location>();
-
-            connections = new List<LocationConnection>();
-
-            if (iceTexture==null) iceTexture = new Sprite("Content/Map/iceSurface.png", Vector2.Zero);
-            if (iceCraters == null) iceCraters = Game1.TextureLoader.FromFile("Content/Map/iceCraters.png");
-            if (iceCrack == null) iceCrack = Game1.TextureLoader.FromFile("Content/Map/iceCrack.png");
-            
-            Rand.SetSyncedSeed(this.seed.GetHashCode());
-
-            GenerateLocations();
-
-            currentLocation = locations[locations.Count / 2];
-            GenerateDifficulties(currentLocation, new List<LocationConnection> (connections), 10.0f);
-
-            foreach (LocationConnection connection in connections)
-            {
-                connection.Level = Level.CreateRandom(connection);
-            }
-        }
-
-        private void GenerateLocations()
-        {
-            Voronoi voronoi = new Voronoi(0.5f);
-
-            List<Vector2> sites = new List<Vector2>();
-            for (int i = 0; i < 50; i++)
-            {
-                sites.Add(new Vector2(Rand.Range(0.0f, size, false), Rand.Range(0.0f, size, false)));
-            }
-            
-            List<GraphEdge> edges = voronoi.MakeVoronoiGraph(sites, size, size);
-            
-            sites.Clear();
-            foreach (GraphEdge edge in edges)
-            {
-                if (edge.point1 == edge.point2) continue;
-
-                //remove points from the edge of the map
-                if (edge.point1.X == 0 || edge.point1.X == size) continue;
-                if (edge.point1.Y == 0 || edge.point1.Y == size) continue;
-                if (edge.point2.X == 0 || edge.point2.X == size) continue;
-                if (edge.point2.Y == 0 || edge.point2.Y == size) continue;
-
-                Location[] newLocations = new Location[2];
-                newLocations[0] = locations.Find(l => l.MapPosition == edge.point1 || l.MapPosition == edge.point2);
-                newLocations[1] = locations.Find(l => l != newLocations[0] && (l.MapPosition == edge.point1 || l.MapPosition == edge.point2));
-                
-                for (int i = 0; i < 2; i++)
-                {
-                    if (newLocations[i] != null) continue;
-
-                    Vector2[] points = new Vector2[] { edge.point1, edge.point2 };
-
-                    int positionIndex = Rand.Int(1,false);
-
-                    Vector2 position = points[positionIndex];
-                    if (newLocations[1 - i] != null && newLocations[1 - i].MapPosition == position) position = points[1 - positionIndex];
-
-                    newLocations[i] = Location.CreateRandom(position);
-                    locations.Add(newLocations[i]);
-                }
-                int seed = (newLocations[0].GetHashCode() | newLocations[1].GetHashCode());
-                connections.Add(new LocationConnection(newLocations[0], newLocations[1]));
-            }
-
-            float minDistance = 50.0f;
-            for (int i = connections.Count - 1; i >= 0; i--)
-            {
-                LocationConnection connection = connections[i];
-
-                if (Vector2.Distance(connection.Locations[0].MapPosition, connection.Locations[1].MapPosition) > minDistance)
-                {
-                    continue;
-                }
-
-                locations.Remove(connection.Locations[0]);
-                connections.Remove(connection);
-
-                foreach (LocationConnection connection2 in connections)
-                {
-                    if (connection2.Locations[0] == connection.Locations[0]) connection2.Locations[0] = connection.Locations[1];
-                    if (connection2.Locations[1] == connection.Locations[0]) connection2.Locations[1] = connection.Locations[1];
-                }
-            }
-
-                foreach (LocationConnection connection in connections)
-                {
-                    connection.Locations[0].Connections.Add(connection);
-                    connection.Locations[1].Connections.Add(connection);
-                }
-
-            for (int i = connections.Count - 1; i >= 0; i--)
-            {
-                i = Math.Min(i, connections.Count - 1);
-
-                LocationConnection connection = connections[i];
-
-                for (int n = Math.Min(i - 1,connections.Count - 1); n >= 0; n--)
-                {
-                    if (connection.Locations.Contains(connections[n].Locations[0])
-                        && connection.Locations.Contains(connections[n].Locations[1]))
-                    {
-                        connections.RemoveAt(n);                        
-                    }
-                }
-            }
-
-            foreach (LocationConnection connection in connections)
-            {
-                Vector2 start = connection.Locations[0].MapPosition;
-                Vector2 end = connection.Locations[1].MapPosition;
-                int generations = (int)(Math.Sqrt(Vector2.Distance(start, end) / 10.0f));
-                connection.CrackSegments = GenerateCrack(start, end, generations);
-            }
-
-        }
-
-        private void GenerateDifficulties(Location start, List<LocationConnection> locations, float currDifficulty)
-        {
-            //start.Difficulty = currDifficulty;
-            currDifficulty += Rand.Range(difficultyIncrease.X, difficultyIncrease.Y, false);
-            if (currDifficulty > Rand.Range(difficultyCutoff.X, difficultyCutoff.Y, false)) currDifficulty = 10.0f;
-            
-            foreach (LocationConnection connection in start.Connections)
-            {
-                if (!locations.Contains(connection)) continue;
-
-                Location nextLocation = connection.OtherLocation(start);
-                locations.Remove(connection);
-
-                connection.Difficulty = currDifficulty;
-                
-                GenerateDifficulties(nextLocation, locations, currDifficulty);
-            }
-        }
-
-        private List<Vector2[]> GenerateCrack(Vector2 start, Vector2 end, int generations)
-        {
-            List<Vector2[]> segments = new List<Vector2[]>();
-
-            segments.Add(new Vector2[] {start, end});
-
-            float offsetAmount = 5.0f;
-
-            for (int n = 0; n < generations; n++)
-            {
-                for (int i = 0; i < segments.Count; i++)
-                {
-                    Vector2 startSegment = segments[i][0];
-                    Vector2 endSegment = segments[i][1];
-
-                    segments.RemoveAt(i);
-
-                    Vector2 midPoint = (startSegment + endSegment) / 2.0f;
-
-                    Vector2 normal = Vector2.Normalize(endSegment - startSegment);
-                    normal = new Vector2(-normal.Y, normal.X);
-                    midPoint += normal * Rand.Range(-offsetAmount, offsetAmount, false);
-
-                    segments.Insert(i, new Vector2[] { startSegment, midPoint });
-                    segments.Insert(i+1, new Vector2[] { midPoint, endSegment });
-
-                    i++;
-                }
-            }
-
-            return segments;
-        }
-
-        public void MoveToNextLocation()
-        {
-            currentLocation = selectedLocation;
-            selectedLocation = null;
-        }
-
-        public void SetLocation(int index)
-        {
-            if (index < 0 || index >= locations.Count)
-            {
-                DebugConsole.ThrowError("Location index out of bounds");
-                return;
-            }
-            currentLocation = locations[index];
-        }
-
-        private Location highlightedLocation;
-        public void Draw(SpriteBatch spriteBatch, Rectangle rect, float scale = 1.0f)
-        {
-            //GUI.DrawRectangle(spriteBatch, rect, Color.DarkBlue, true);
-
-            Vector2 rectCenter = new Vector2(rect.Center.X, rect.Center.Y);
-            Vector2 offset = -currentLocation.MapPosition;
-
-            iceTexture.DrawTiled(spriteBatch, new Vector2(rect.X, rect.Y), new Vector2(rect.Width, rect.Height), offset, Color.White);
-
-            //spriteBatch.Draw(iceTexture, offset, rect, null, null, 0f, null, Color.White, SpriteEffects.None, 0.0f);
-
-            //Vector2 scale = new Vector2((float)rect.Width/ size, (float)rect.Height/size);
-
-            float maxDist = 20.0f;
-            float closestDist = 0.0f;
-            highlightedLocation = null;
-            for (int i = 0; i < locations.Count;i++ )
-            {
-                Location location = locations[i];
-                Vector2 pos = rectCenter + (location.MapPosition+offset) * scale;
-
-                if (!rect.Contains(pos)) continue;
-
-                float dist = Vector2.Distance(PlayerInput.MousePosition, pos);
-                if (dist < maxDist && (highlightedLocation == null || dist < closestDist))
-                {
-                    closestDist = dist;
-                    highlightedLocation = location;
-                }
-            }
-
-
-            foreach (LocationConnection connection in connections)
-            {
-                Color crackColor = Color.White * Math.Max(connection.Difficulty/100.0f, 0.5f);
-
-                if (highlightedLocation != currentLocation &&
-                    connection.Locations.Contains(highlightedLocation) && connection.Locations.Contains(currentLocation))
-                {
-                    crackColor = Color.Red;
-
-                    if (PlayerInput.LeftButtonClicked()&&
-                        selectedLocation != highlightedLocation && highlightedLocation != null)
-                    {
-                        selectedConnection = connection;
-                        selectedLocation = highlightedLocation;    
-                        Game1.LobbyScreen.SelectLocation(highlightedLocation, connection);                    
-                    } 
-                }
-
-
-                if (selectedLocation != currentLocation &&
-                    (connection.Locations.Contains(selectedLocation) && connection.Locations.Contains(currentLocation)))
-                {
-                    crackColor = Color.Red;
-                }
-
-                foreach (Vector2[] segment in connection.CrackSegments)
-                {
-                    Vector2 start = rectCenter + (segment[0] + offset) * scale;
-                    Vector2 end = rectCenter + (segment[1] + offset) * scale;
-                    
-                    if (!rect.Contains(start) || !rect.Contains(end)) continue;
-
-                    float dist = Vector2.Distance(start, end);
-
-                    spriteBatch.Draw(iceCrack,
-                        new Rectangle((int)start.X, (int)start.Y, (int)dist+2, 30),
-                        new Rectangle(0, 0, iceCrack.Width, 60), crackColor, MathUtils.VectorToAngle(end -start),
-                        new Vector2(0, 30), SpriteEffects.None, 0.01f);
-                }
-            }
-
-            for (int i = 0; i < locations.Count; i++)
-            {
-                Location location = locations[i];
-                Vector2 pos = rectCenter + (location.MapPosition + offset) * scale;
-                
-                if (!rect.Contains(pos)) continue;
-
-                Color color = location.Connections.Find(c => c.Locations.Contains(currentLocation))==null ? Color.White : Color.Green;
-
-                color *= (location.Discovered) ? 0.8f : 0.4f;
-
-                if (location == currentLocation) color = Color.Orange;
-
-                location.Type.Sprite.Draw(spriteBatch, pos, color);
-
-                //int imgIndex = i % 16;
-                //int xCell = imgIndex % 4;
-                //int yCell = (int)Math.Floor(imgIndex / 4.0f);
-                //spriteBatch.Draw(iceCraters, pos, 
-                //    new Rectangle(xCell * 64, yCell * 64, 64, 64), 
-                //    Color.White, i, 
-                //    new Vector2(32, 32), 0.5f*scale, SpriteEffects.None, 0.0f);
-
-            }
-
-            for (int i = 0; i < 3; i++ )
-            {
-                Location location = (i == 0) ? highlightedLocation : selectedLocation;
-                if (i == 2) location = currentLocation;
-                
-                if (location == null) continue;
-
-                Vector2 pos = rectCenter + (location.MapPosition + offset) * scale;
-                pos.X = (int)pos.X;
-                pos.Y = (int)pos.Y;
-                if (highlightedLocation == location)
-                {
-                    spriteBatch.DrawString(GUI.Font, location.Name, pos + new Vector2(0, 50), Color.DarkRed, 0.0f, GUI.Font.MeasureString(location.Name)/2.0f, 1.0f, SpriteEffects.None, 0.0f);
-                }
-            }
-
-        }
-    }
-
-
-    class LocationConnection
-    {
-        private Location[] locations;
-        private Level level;
-
-        public float Difficulty;
-
-        public List<Vector2[]> CrackSegments;
-
-        private int questsCompleted;
-
-        private Quest quest;
-        public Quest Quest
-        {
-            get 
-            {         
-                if (quest==null || quest.Completed)
-                {
-                    if (quest !=null && quest.Completed) questsCompleted++;
-
-                    int seed = (int)locations[0].MapPosition.X + (int)locations[0].MapPosition.Y * 100;
-                    seed += (int)locations[1].MapPosition.X*10000 + (int)locations[1].MapPosition.Y * 1000000;
-
-                    Random rand = new Random(seed + questsCompleted);
-                    quest = Quest.LoadRandom(locations, rand);
-                }
-
-                return quest;
-            }
-        }
-
-
-
-        public Location[] Locations
-        {
-            get { return locations; }
-        }
-        
-        public Level Level
-        {
-            get { return level; }
-            set { level = value; }
-        }
-        
-        public LocationConnection(Location location1, Location location2)
-        {
-            locations = new Location[] { location1, location2 };
-
-            questsCompleted = 0;
-        }
-
-        public Location OtherLocation(Location location)
-        {
-            if (locations[0] == location)
-            {
-                return locations[1];
-            }
-            else if (locations[1] == location)
-            {
-                return locations[0];
-            }
-            else
-            {
-                return null;
-            }
-        }
-    }
-}
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Voronoi2;
+
+namespace Subsurface
+{
+    class Map
+    {
+        Vector2 difficultyIncrease = new Vector2(5.0f,10.0f);
+        Vector2 difficultyCutoff = new Vector2(80.0f, 100.0f);
+
+        private List<Level> levels;
+
+        private List<Location> locations;
+
+        private List<LocationConnection> connections;
+        
+        private string seed;
+        private int size;
+
+        private static Sprite iceTexture;
+        private static Texture2D iceCraters;
+        private static Texture2D iceCrack;
+
+        private Location currentLocation;
+        private Location selectedLocation;
+
+        private LocationConnection selectedConnection;
+
+        public Location CurrentLocation
+        {
+            get { return currentLocation; }
+        }
+
+        public int CurrentLocationIndex
+        {
+            get { return locations.IndexOf(currentLocation); }
+        }
+
+        public Location SelectedLocation
+        {
+            get { return selectedLocation; }
+        }
+
+        public LocationConnection SelectedConnection
+        {
+            get { return selectedConnection; }
+        }
+
+        public string Seed
+        {
+            get { return seed; }
+        }
+
+        public Map(string seed, int size)
+        {
+            this.seed = seed;
+
+            this.size = size;
+
+            levels = new List<Level>();
+
+            locations = new List<Location>();
+
+            connections = new List<LocationConnection>();
+
+            if (iceTexture==null) iceTexture = new Sprite("Content/Map/iceSurface.png", Vector2.Zero);
+            if (iceCraters == null) iceCraters = Game1.TextureLoader.FromFile("Content/Map/iceCraters.png");
+            if (iceCrack == null) iceCrack = Game1.TextureLoader.FromFile("Content/Map/iceCrack.png");
+            
+            Rand.SetSyncedSeed(this.seed.GetHashCode());
+
+            GenerateLocations();
+
+            currentLocation = locations[locations.Count / 2];
+            GenerateDifficulties(currentLocation, new List<LocationConnection> (connections), 10.0f);
+
+            foreach (LocationConnection connection in connections)
+            {
+                connection.Level = Level.CreateRandom(connection);
+            }
+        }
+
+        private void GenerateLocations()
+        {
+            Voronoi voronoi = new Voronoi(0.5f);
+
+            List<Vector2> sites = new List<Vector2>();
+            for (int i = 0; i < 50; i++)
+            {
+                sites.Add(new Vector2(Rand.Range(0.0f, size, false), Rand.Range(0.0f, size, false)));
+            }
+            
+            List<GraphEdge> edges = voronoi.MakeVoronoiGraph(sites, size, size);
+            
+            sites.Clear();
+            foreach (GraphEdge edge in edges)
+            {
+                if (edge.point1 == edge.point2) continue;
+
+                //remove points from the edge of the map
+                if (edge.point1.X == 0 || edge.point1.X == size) continue;
+                if (edge.point1.Y == 0 || edge.point1.Y == size) continue;
+                if (edge.point2.X == 0 || edge.point2.X == size) continue;
+                if (edge.point2.Y == 0 || edge.point2.Y == size) continue;
+
+                Location[] newLocations = new Location[2];
+                newLocations[0] = locations.Find(l => l.MapPosition == edge.point1 || l.MapPosition == edge.point2);
+                newLocations[1] = locations.Find(l => l != newLocations[0] && (l.MapPosition == edge.point1 || l.MapPosition == edge.point2));
+                
+                for (int i = 0; i < 2; i++)
+                {
+                    if (newLocations[i] != null) continue;
+
+                    Vector2[] points = new Vector2[] { edge.point1, edge.point2 };
+
+                    int positionIndex = Rand.Int(1,false);
+
+                    Vector2 position = points[positionIndex];
+                    if (newLocations[1 - i] != null && newLocations[1 - i].MapPosition == position) position = points[1 - positionIndex];
+
+                    newLocations[i] = Location.CreateRandom(position);
+                    locations.Add(newLocations[i]);
+                }
+                int seed = (newLocations[0].GetHashCode() | newLocations[1].GetHashCode());
+                connections.Add(new LocationConnection(newLocations[0], newLocations[1]));
+            }
+
+            float minDistance = 50.0f;
+            for (int i = connections.Count - 1; i >= 0; i--)
+            {
+                LocationConnection connection = connections[i];
+
+                if (Vector2.Distance(connection.Locations[0].MapPosition, connection.Locations[1].MapPosition) > minDistance)
+                {
+                    continue;
+                }
+
+                locations.Remove(connection.Locations[0]);
+                connections.Remove(connection);
+
+                foreach (LocationConnection connection2 in connections)
+                {
+                    if (connection2.Locations[0] == connection.Locations[0]) connection2.Locations[0] = connection.Locations[1];
+                    if (connection2.Locations[1] == connection.Locations[0]) connection2.Locations[1] = connection.Locations[1];
+                }
+            }
+
+                foreach (LocationConnection connection in connections)
+                {
+                    connection.Locations[0].Connections.Add(connection);
+                    connection.Locations[1].Connections.Add(connection);
+                }
+
+            for (int i = connections.Count - 1; i >= 0; i--)
+            {
+                i = Math.Min(i, connections.Count - 1);
+
+                LocationConnection connection = connections[i];
+
+                for (int n = Math.Min(i - 1,connections.Count - 1); n >= 0; n--)
+                {
+                    if (connection.Locations.Contains(connections[n].Locations[0])
+                        && connection.Locations.Contains(connections[n].Locations[1]))
+                    {
+                        connections.RemoveAt(n);                        
+                    }
+                }
+            }
+
+            foreach (LocationConnection connection in connections)
+            {
+                Vector2 start = connection.Locations[0].MapPosition;
+                Vector2 end = connection.Locations[1].MapPosition;
+                int generations = (int)(Math.Sqrt(Vector2.Distance(start, end) / 10.0f));
+                connection.CrackSegments = GenerateCrack(start, end, generations);
+            }
+
+        }
+
+        private void GenerateDifficulties(Location start, List<LocationConnection> locations, float currDifficulty)
+        {
+            //start.Difficulty = currDifficulty;
+            currDifficulty += Rand.Range(difficultyIncrease.X, difficultyIncrease.Y, false);
+            if (currDifficulty > Rand.Range(difficultyCutoff.X, difficultyCutoff.Y, false)) currDifficulty = 10.0f;
+            
+            foreach (LocationConnection connection in start.Connections)
+            {
+                if (!locations.Contains(connection)) continue;
+
+                Location nextLocation = connection.OtherLocation(start);
+                locations.Remove(connection);
+
+                connection.Difficulty = currDifficulty;
+                
+                GenerateDifficulties(nextLocation, locations, currDifficulty);
+            }
+        }
+
+        private List<Vector2[]> GenerateCrack(Vector2 start, Vector2 end, int generations)
+        {
+            List<Vector2[]> segments = new List<Vector2[]>();
+
+            segments.Add(new Vector2[] {start, end});
+
+            float offsetAmount = 5.0f;
+
+            for (int n = 0; n < generations; n++)
+            {
+                for (int i = 0; i < segments.Count; i++)
+                {
+                    Vector2 startSegment = segments[i][0];
+                    Vector2 endSegment = segments[i][1];
+
+                    segments.RemoveAt(i);
+
+                    Vector2 midPoint = (startSegment + endSegment) / 2.0f;
+
+                    Vector2 normal = Vector2.Normalize(endSegment - startSegment);
+                    normal = new Vector2(-normal.Y, normal.X);
+                    midPoint += normal * Rand.Range(-offsetAmount, offsetAmount, false);
+
+                    segments.Insert(i, new Vector2[] { startSegment, midPoint });
+                    segments.Insert(i+1, new Vector2[] { midPoint, endSegment });
+
+                    i++;
+                }
+            }
+
+            return segments;
+        }
+
+        public void MoveToNextLocation()
+        {
+            currentLocation = selectedLocation;
+            selectedLocation = null;
+        }
+
+        public void SetLocation(int index)
+        {
+            if (index < 0 || index >= locations.Count)
+            {
+                DebugConsole.ThrowError("Location index out of bounds");
+                return;
+            }
+            currentLocation = locations[index];
+        }
+
+        private Location highlightedLocation;
+        public void Draw(SpriteBatch spriteBatch, Rectangle rect, float scale = 1.0f)
+        {
+            //GUI.DrawRectangle(spriteBatch, rect, Color.DarkBlue, true);
+            
+            Vector2 rectCenter = new Vector2(rect.Center.X, rect.Center.Y);
+            Vector2 offset = -currentLocation.MapPosition;
+
+            iceTexture.DrawTiled(spriteBatch, new Vector2(rect.X, rect.Y), new Vector2(rect.Width, rect.Height), offset, Color.White);
+            //spriteBatch.Draw(iceTexture, offset, rect, null, null, 0f, null, Color.White, SpriteEffects.None, 0.0f);
+
+            //Vector2 scale = new Vector2((float)rect.Width/ size, (float)rect.Height/size);
+
+            float maxDist = 20.0f;
+            float closestDist = 0.0f;
+            highlightedLocation = null;
+            for (int i = 0; i < locations.Count;i++ )
+            {
+                Location location = locations[i];
+                Vector2 pos = rectCenter + (location.MapPosition+offset) * scale;
+
+                if (!rect.Contains(pos)) continue;
+
+                float dist = Vector2.Distance(PlayerInput.MousePosition, pos);
+                if (dist < maxDist && (highlightedLocation == null || dist < closestDist))
+                {
+                    closestDist = dist;
+                    highlightedLocation = location;
+                }
+            }
+
+
+            foreach (LocationConnection connection in connections)
+            {
+                Color crackColor = Color.White * Math.Max(connection.Difficulty/100.0f, 0.5f);
+
+                if (highlightedLocation != currentLocation &&
+                    connection.Locations.Contains(highlightedLocation) && connection.Locations.Contains(currentLocation))
+                {
+                    crackColor = Color.Red;
+
+                    if (PlayerInput.LeftButtonClicked()&&
+                        selectedLocation != highlightedLocation && highlightedLocation != null)
+                    {
+                        selectedConnection = connection;
+                        selectedLocation = highlightedLocation;    
+                        Game1.LobbyScreen.SelectLocation(highlightedLocation, connection);                    
+                    } 
+                }
+
+
+                if (selectedLocation != currentLocation &&
+                    (connection.Locations.Contains(selectedLocation) && connection.Locations.Contains(currentLocation)))
+                {
+                    crackColor = Color.Red;
+                }
+
+                foreach (Vector2[] segment in connection.CrackSegments)
+                {
+                    Vector2 start = rectCenter + (segment[0] + offset) * scale;
+                    Vector2 end = rectCenter + (segment[1] + offset) * scale;
+                    
+                    if (!rect.Contains(start) || !rect.Contains(end)) continue;
+
+                    float dist = Vector2.Distance(start, end);
+
+                    spriteBatch.Draw(iceCrack,
+                        new Rectangle((int)start.X, (int)start.Y, (int)dist+2, 30),
+                        new Rectangle(0, 0, iceCrack.Width, 60), crackColor, MathUtils.VectorToAngle(end -start),
+                        new Vector2(0, 30), SpriteEffects.None, 0.01f);
+                }
+            }
+
+            for (int i = 0; i < locations.Count; i++)
+            {
+                Location location = locations[i];
+                Vector2 pos = rectCenter + (location.MapPosition + offset) * scale;
+                
+                if (!rect.Contains(pos)) continue;
+
+                Color color = location.Connections.Find(c => c.Locations.Contains(currentLocation))==null ? Color.White : Color.Green;
+
+                color *= (location.Discovered) ? 0.8f : 0.4f;
+
+                if (location == currentLocation) color = Color.Orange;
+
+                location.Type.Sprite.Draw(spriteBatch, pos, color, 0.0f, scale/3.0f);
+
+                //int imgIndex = i % 16;
+                //int xCell = imgIndex % 4;
+                //int yCell = (int)Math.Floor(imgIndex / 4.0f);
+                //spriteBatch.Draw(iceCraters, pos, 
+                //    new Rectangle(xCell * 64, yCell * 64, 64, 64), 
+                //    Color.White, i, 
+                //    new Vector2(32, 32), 0.5f*scale, SpriteEffects.None, 0.0f);
+
+            }
+
+            for (int i = 0; i < 3; i++ )
+            {
+                Location location = (i == 0) ? highlightedLocation : selectedLocation;
+                if (i == 2) location = currentLocation;
+                
+                if (location == null) continue;
+
+                Vector2 pos = rectCenter + (location.MapPosition + offset) * scale;
+                pos.X = (int)pos.X;
+                pos.Y = (int)pos.Y;
+                if (highlightedLocation == location)
+                {
+                    spriteBatch.DrawString(GUI.Font, location.Name, pos + new Vector2(0, 50), Color.DarkRed, 0.0f, GUI.Font.MeasureString(location.Name)/2.0f, 1.0f, SpriteEffects.None, 0.0f);
+                }
+            }
+
+        }
+    }
+
+
+    class LocationConnection
+    {
+        private Location[] locations;
+        private Level level;
+
+        public float Difficulty;
+
+        public List<Vector2[]> CrackSegments;
+
+        private int questsCompleted;
+
+        private Quest quest;
+        public Quest Quest
+        {
+            get 
+            {         
+                if (quest==null || quest.Completed)
+                {
+                    if (quest !=null && quest.Completed) questsCompleted++;
+
+                    int seed = (int)locations[0].MapPosition.X + (int)locations[0].MapPosition.Y * 100;
+                    seed += (int)locations[1].MapPosition.X*10000 + (int)locations[1].MapPosition.Y * 1000000;
+
+                    Random rand = new Random(seed + questsCompleted);
+
+                    if (rand.NextDouble() < 0.3f) return null;
+
+                    quest = Quest.LoadRandom(locations, rand);
+                }
+
+                return quest;
+            }
+        }
+
+
+
+        public Location[] Locations
+        {
+            get { return locations; }
+        }
+        
+        public Level Level
+        {
+            get { return level; }
+            set { level = value; }
+        }
+        
+        public LocationConnection(Location location1, Location location2)
+        {
+            locations = new Location[] { location1, location2 };
+
+            questsCompleted = 0;
+        }
+
+        public Location OtherLocation(Location location)
+        {
+            if (locations[0] == location)
+            {
+                return locations[1];
+            }
+            else if (locations[1] == location)
+            {
+                return locations[0];
+            }
+            else
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/Subsurface/Map/MapEntity.cs b/Subsurface/Source/Map/MapEntity.cs
similarity index 100%
rename from Subsurface/Map/MapEntity.cs
rename to Subsurface/Source/Map/MapEntity.cs
diff --git a/Subsurface/Map/MapEntityPrefab.cs b/Subsurface/Source/Map/MapEntityPrefab.cs
similarity index 100%
rename from Subsurface/Map/MapEntityPrefab.cs
rename to Subsurface/Source/Map/MapEntityPrefab.cs
diff --git a/Subsurface/Map/Md5Hash.cs b/Subsurface/Source/Map/Md5Hash.cs
similarity index 100%
rename from Subsurface/Map/Md5Hash.cs
rename to Subsurface/Source/Map/Md5Hash.cs
diff --git a/Subsurface/Map/Structure.cs b/Subsurface/Source/Map/Structure.cs
similarity index 100%
rename from Subsurface/Map/Structure.cs
rename to Subsurface/Source/Map/Structure.cs
diff --git a/Subsurface/Map/StructurePrefab.cs b/Subsurface/Source/Map/StructurePrefab.cs
similarity index 100%
rename from Subsurface/Map/StructurePrefab.cs
rename to Subsurface/Source/Map/StructurePrefab.cs
diff --git a/Subsurface/Map/Submarine.cs b/Subsurface/Source/Map/Submarine.cs
similarity index 98%
rename from Subsurface/Map/Submarine.cs
rename to Subsurface/Source/Map/Submarine.cs
index 94bced960..3b42ba5c3 100644
--- a/Subsurface/Map/Submarine.cs
+++ b/Subsurface/Source/Map/Submarine.cs
@@ -537,7 +537,7 @@ namespace Subsurface
 
 
             System.Diagnostics.Debug.WriteLine("IMPACT:"+impact);
-            if (impact < 5.0f)
+            if (impact < 4.0f)
             {
                 speed = ConvertUnits.ToDisplayUnits(w * 0.9f - u * 0.2f);
                 return true;
@@ -547,6 +547,14 @@ namespace Subsurface
                 speed = ConvertUnits.ToDisplayUnits(w * 0.9f + u * 0.5f);
             }
 
+            if (contact.Manifold.PointCount >= 1)
+            {
+                FixedArray2<Vector2> worldPoints;
+                contact.GetWorldManifold(out normal, out worldPoints);
+
+                Game1.GameScreen.Cam.Shake = impact;
+            }
+
             collisionRigidness = 0.8f;
 
             collidingCell = cell;
@@ -613,7 +621,8 @@ namespace Subsurface
             //    DebugConsole.ThrowError("No save file selected");
             //    return;
             //}
-            XDocument doc = new XDocument(new XElement((XName)name));
+            XDocument doc = new XDocument(new XElement("Submarine"));
+            doc.Root.Add(new XAttribute("name", name));
 
             foreach (MapEntity e in MapEntity.mapEntityList)
             {
diff --git a/Subsurface/Map/WaterRenderer.cs b/Subsurface/Source/Map/WaterRenderer.cs
similarity index 100%
rename from Subsurface/Map/WaterRenderer.cs
rename to Subsurface/Source/Map/WaterRenderer.cs
diff --git a/Subsurface/Map/WayPoint.cs b/Subsurface/Source/Map/WayPoint.cs
similarity index 100%
rename from Subsurface/Map/WayPoint.cs
rename to Subsurface/Source/Map/WayPoint.cs
diff --git a/Subsurface/Networking/GameClient.cs b/Subsurface/Source/Networking/GameClient.cs
similarity index 99%
rename from Subsurface/Networking/GameClient.cs
rename to Subsurface/Source/Networking/GameClient.cs
index 6765e6b71..26b59ee79 100644
--- a/Subsurface/Networking/GameClient.cs
+++ b/Subsurface/Source/Networking/GameClient.cs
@@ -74,8 +74,8 @@ namespace Subsurface.Networking
             // Create new instance of configs. Parameter is "application Id". It has to be same on client and server.
             NetPeerConfiguration Config = new NetPeerConfiguration("subsurface");
             
-            Config.SimulatedLoss = 0.2f;
-            Config.SimulatedMinimumLatency = 0.25f;
+            //Config.SimulatedLoss = 0.2f;
+            //Config.SimulatedMinimumLatency = 0.25f;
 
             // Create new client, with previously created configs
             client = new NetClient(Config);
@@ -335,7 +335,7 @@ namespace Subsurface.Networking
                         TimeSpan duration = new TimeSpan(0,(int)durationMinutes,0);
 
                         //int gameModeIndex = inc.ReadInt32();
-                        Game1.GameSession = new GameSession(Submarine.Loaded, Game1.NetLobbyScreen.SelectedMode);
+                        Game1.GameSession = new GameSession(Submarine.Loaded, "", Game1.NetLobbyScreen.SelectedMode);
                         Game1.GameSession.StartShift(duration, levelSeed);
 
                         //myCharacter = ReadCharacterData(inc);
diff --git a/Subsurface/Networking/GameServer.cs b/Subsurface/Source/Networking/GameServer.cs
similarity index 91%
rename from Subsurface/Networking/GameServer.cs
rename to Subsurface/Source/Networking/GameServer.cs
index 6741c1fc2..a400bc616 100644
--- a/Subsurface/Networking/GameServer.cs
+++ b/Subsurface/Source/Networking/GameServer.cs
@@ -9,15 +9,16 @@ namespace Subsurface.Networking
 {
     class GameServer : NetworkMember
     {
-        NetServer Server;
-        NetPeerConfiguration Config;
-        
+
         public List<Client> connectedClients = new List<Client>();
 
-        TimeSpan SparseUpdateInterval = new TimeSpan(0, 0, 0, 1);
-        DateTime sparseUpdateTimer;
+        private NetServer server;
+        private NetPeerConfiguration config;
+        
+        private TimeSpan SparseUpdateInterval = new TimeSpan(0, 0, 0, 1);
+        private DateTime sparseUpdateTimer;
 
-        Client myClient;
+        private Client myClient;
 
         public GameServer(string name, int port)
         {
@@ -26,21 +27,24 @@ namespace Subsurface.Networking
 
             this.name = name;
 
-            Config = new NetPeerConfiguration("subsurface");
+            config = new NetPeerConfiguration("subsurface");
 
-            Config.Port = port;
-            
-            //Config.SimulatedLoss = 0.2f;
-            //Config.SimulatedMinimumLatency = 0.25f;
+            config.Port = port;
 
-            Config.MaximumConnections = 10;
+            config.EnableUPnP = true;
+
+            config.MaximumConnections = 10;
             
-            Config.EnableMessageType(NetIncomingMessageType.ConnectionApproval);
+            config.EnableMessageType(NetIncomingMessageType.ConnectionApproval);
                         
             try
             {
-                Server = new NetServer(Config);    
-                Server.Start();
+                server = new NetServer(config);    
+                server.Start();
+
+                // attempt to forward port
+                server.UPnP.ForwardPort(port, "subsurface");
+
             }
 
             catch (Exception e)
@@ -63,7 +67,7 @@ namespace Subsurface.Networking
 
             if (gameStarted) inGameHUD.Update((float)Physics.step);
 
-            NetIncomingMessage inc = Server.ReadMessage();
+            NetIncomingMessage inc = server.ReadMessage();
             if (inc != null)
             {
                 try
@@ -79,7 +83,7 @@ namespace Subsurface.Networking
             // if 30ms has passed
             if (updateTimer < DateTime.Now)
             {
-                if (Server.ConnectionsCount > 0)
+                if (server.ConnectionsCount > 0)
                 {
                     if (sparseUpdateTimer < DateTime.Now) SparseUpdate();
 
@@ -209,7 +213,7 @@ namespace Subsurface.Networking
                             Game1.NetLobbyScreen.AddPlayer(sender);
 
                             // Notify the client that they have logged in
-                            outmsg = Server.CreateMessage();
+                            outmsg = server.CreateMessage();
 
                             outmsg.Write((byte)PacketTypes.LoggedIn);
 
@@ -228,10 +232,10 @@ namespace Subsurface.Networking
 
                             if (myClient != null) outmsg.Write(myClient.name);
 
-                            Server.SendMessage(outmsg, inc.SenderConnection, NetDeliveryMethod.ReliableUnordered, 0);
+                            server.SendMessage(outmsg, inc.SenderConnection, NetDeliveryMethod.ReliableUnordered, 0);
                             
                             //notify other clients about the new client
-                            outmsg = Server.CreateMessage();
+                            outmsg = server.CreateMessage();
                             outmsg.Write((byte)PacketTypes.PlayerJoined);
 
                             outmsg.Write(sender.name);
@@ -259,7 +263,7 @@ namespace Subsurface.Networking
                             if (!gameStarted) break;
                             if (!NetworkEvent.ReadData(inc)) break;
 
-                            outmsg = Server.CreateMessage();
+                            outmsg = server.CreateMessage();
                             outmsg.Write(inc);
 
                             List<NetConnection> recipients = new List<NetConnection>();
@@ -273,7 +277,7 @@ namespace Subsurface.Networking
                             }
 
                             if (recipients.Count == 0) break;
-                            Server.SendMessage(outmsg, recipients, inc.DeliveryMethod, 0);  
+                            server.SendMessage(outmsg, recipients, inc.DeliveryMethod, 0);  
                             
                             break;
                         case (byte)PacketTypes.Chatmessage:
@@ -308,7 +312,7 @@ namespace Subsurface.Networking
 
             if (recipients.Count == 0) return;
 
-            Server.SendMessage(msg, recipients, deliveryMethod, 0);  
+            server.SendMessage(msg, recipients, deliveryMethod, 0);  
             
         }
 
@@ -321,15 +325,15 @@ namespace Subsurface.Networking
             {
                 //System.Diagnostics.Debug.WriteLine("networkevent "+networkEvent.ID);
 
-                NetOutgoingMessage message = Server.CreateMessage();
+                NetOutgoingMessage message = server.CreateMessage();
                 message.Write((byte)PacketTypes.NetworkEvent);
                 //if (!networkEvent.IsClient) continue;
                             
                 networkEvent.FillData(message);
 
-                if (Server.ConnectionsCount>0)
+                if (server.ConnectionsCount>0)
                 {
-                    Server.SendMessage(message, Server.Connections, 
+                    server.SendMessage(message, server.Connections, 
                         (networkEvent.IsImportant) ? NetDeliveryMethod.Unreliable : NetDeliveryMethod.ReliableUnordered, 0);  
                 }
                             
@@ -347,7 +351,7 @@ namespace Subsurface.Networking
             
             //selectedMap.Load();
 
-            Game1.GameSession = new GameSession(selectedMap, Game1.NetLobbyScreen.SelectedMode);
+            Game1.GameSession = new GameSession(selectedMap, "", Game1.NetLobbyScreen.SelectedMode);
             Game1.GameSession.StartShift(Game1.NetLobbyScreen.GameDuration, Game1.NetLobbyScreen.LevelSeed);
             //EventManager.SelectEvent(Game1.netLobbyScreen.SelectedEvent);
 
@@ -387,7 +391,7 @@ namespace Subsurface.Networking
 
             //foreach (Client client in connectedClients)
             //{
-            NetOutgoingMessage msg = Server.CreateMessage();
+            NetOutgoingMessage msg = server.CreateMessage();
             msg.Write((byte)PacketTypes.StartGame);
 
             msg.Write(seed);
@@ -441,13 +445,13 @@ namespace Subsurface.Networking
 
             if (connectedClients.Count>0)
             {
-                NetOutgoingMessage msg = Server.CreateMessage();
+                NetOutgoingMessage msg = server.CreateMessage();
                 msg.Write((byte)PacketTypes.EndGame);
                 msg.Write(endMessage);
 
-                if (Server.ConnectionsCount > 0)
+                if (server.ConnectionsCount > 0)
                 {
-                    Server.SendMessage(msg, Server.Connections, NetDeliveryMethod.ReliableOrdered, 0);
+                    server.SendMessage(msg, server.Connections, NetDeliveryMethod.ReliableOrdered, 0);
                 }
 
                 foreach (Client client in connectedClients)
@@ -477,23 +481,23 @@ namespace Subsurface.Networking
             if (msg == "") msg = client.name + " has left the server";
             if (targetmsg == "") targetmsg = "You have left the server";
             
-            NetOutgoingMessage outmsg = Server.CreateMessage();
+            NetOutgoingMessage outmsg = server.CreateMessage();
             outmsg.Write((byte)PacketTypes.KickedOut);
             outmsg.Write(targetmsg);
-            Server.SendMessage(outmsg, client.Connection, NetDeliveryMethod.ReliableUnordered, 0);
+            server.SendMessage(outmsg, client.Connection, NetDeliveryMethod.ReliableUnordered, 0);
 
             connectedClients.Remove(client);
 
-            outmsg = Server.CreateMessage();
+            outmsg = server.CreateMessage();
             outmsg.Write((byte)PacketTypes.PlayerLeft);
             outmsg.Write(client.ID);
             outmsg.Write(msg);
 
             Game1.NetLobbyScreen.RemovePlayer(client);
 
-            if (Server.Connections.Count > 0)
+            if (server.Connections.Count > 0)
             {
-                Server.SendMessage(outmsg, Server.Connections, NetDeliveryMethod.ReliableUnordered, 0);
+                server.SendMessage(outmsg, server.Connections, NetDeliveryMethod.ReliableUnordered, 0);
             }
 
             AddChatMessage(msg, ChatMessageType.Server);
@@ -518,24 +522,24 @@ namespace Subsurface.Networking
 
         public void NewTraitor(Client traitor, Client target)
         {
-            NetOutgoingMessage msg = Server.CreateMessage();
+            NetOutgoingMessage msg = server.CreateMessage();
             msg.Write((byte)PacketTypes.Traitor);
             msg.Write(target.name);
-            if (Server.Connections.Count > 0)
+            if (server.Connections.Count > 0)
             {
-                Server.SendMessage(msg, traitor.Connection, NetDeliveryMethod.ReliableUnordered, 0);
+                server.SendMessage(msg, traitor.Connection, NetDeliveryMethod.ReliableUnordered, 0);
             }
         }
 
         public bool UpdateNetLobby(object obj)
         {
-            NetOutgoingMessage msg = Server.CreateMessage();
+            NetOutgoingMessage msg = server.CreateMessage();
             msg.Write((byte)PacketTypes.UpdateNetLobby);
             Game1.NetLobbyScreen.WriteData(msg);
 
-            if (Server.Connections.Count > 0)
+            if (server.Connections.Count > 0)
             {
-                Server.SendMessage(msg, Server.Connections, NetDeliveryMethod.ReliableUnordered, 0);
+                server.SendMessage(msg, server.Connections, NetDeliveryMethod.ReliableUnordered, 0);
             }
 
             return true;
@@ -545,9 +549,9 @@ namespace Subsurface.Networking
         {
             AddChatMessage(message, type);
 
-            if (Server.Connections.Count == 0) return;
+            if (server.Connections.Count == 0) return;
 
-            NetOutgoingMessage msg = Server.CreateMessage();
+            NetOutgoingMessage msg = server.CreateMessage();
             msg.Write((byte)PacketTypes.Chatmessage);
             msg.Write((byte)type);
             msg.Write(message);
@@ -561,12 +565,12 @@ namespace Subsurface.Networking
                 }
                 if (recipients.Count>0)
                 {
-                    Server.SendMessage(msg, recipients, NetDeliveryMethod.ReliableUnordered, 0);
+                    server.SendMessage(msg, recipients, NetDeliveryMethod.ReliableUnordered, 0);
                 }                
             }
             else
             {
-                Server.SendMessage(msg, Server.Connections, NetDeliveryMethod.ReliableUnordered, 0);
+                server.SendMessage(msg, server.Connections, NetDeliveryMethod.ReliableUnordered, 0);
             }
             
         }
@@ -712,7 +716,7 @@ namespace Subsurface.Networking
         /// </summary>
         public void SendRandomData()
         {
-            NetOutgoingMessage msg = Server.CreateMessage();
+            NetOutgoingMessage msg = server.CreateMessage();
             switch (Rand.Int(5))
             {
                 case 0:
@@ -745,7 +749,7 @@ namespace Subsurface.Networking
 
         public override void Disconnect()
         {
-            Server.Shutdown("");
+            server.Shutdown("");
         }
     }
 
diff --git a/Subsurface/Networking/NetworkEvent.cs b/Subsurface/Source/Networking/NetworkEvent.cs
similarity index 100%
rename from Subsurface/Networking/NetworkEvent.cs
rename to Subsurface/Source/Networking/NetworkEvent.cs
diff --git a/Subsurface/Networking/NetworkMember.cs b/Subsurface/Source/Networking/NetworkMember.cs
similarity index 100%
rename from Subsurface/Networking/NetworkMember.cs
rename to Subsurface/Source/Networking/NetworkMember.cs
diff --git a/Subsurface/Particles/Particle.cs b/Subsurface/Source/Particles/Particle.cs
similarity index 100%
rename from Subsurface/Particles/Particle.cs
rename to Subsurface/Source/Particles/Particle.cs
diff --git a/Subsurface/Particles/ParticleManager.cs b/Subsurface/Source/Particles/ParticleManager.cs
similarity index 100%
rename from Subsurface/Particles/ParticleManager.cs
rename to Subsurface/Source/Particles/ParticleManager.cs
diff --git a/Subsurface/Particles/ParticlePrefab.cs b/Subsurface/Source/Particles/ParticlePrefab.cs
similarity index 100%
rename from Subsurface/Particles/ParticlePrefab.cs
rename to Subsurface/Source/Particles/ParticlePrefab.cs
diff --git a/Subsurface/Physics/Physics.cs b/Subsurface/Source/Physics/Physics.cs
similarity index 100%
rename from Subsurface/Physics/Physics.cs
rename to Subsurface/Source/Physics/Physics.cs
diff --git a/Subsurface/Physics/PhysicsBody.cs b/Subsurface/Source/Physics/PhysicsBody.cs
similarity index 100%
rename from Subsurface/Physics/PhysicsBody.cs
rename to Subsurface/Source/Physics/PhysicsBody.cs
diff --git a/Subsurface/PlayerInput.cs b/Subsurface/Source/PlayerInput.cs
similarity index 100%
rename from Subsurface/PlayerInput.cs
rename to Subsurface/Source/PlayerInput.cs
diff --git a/Subsurface/Program.cs b/Subsurface/Source/Program.cs
similarity index 100%
rename from Subsurface/Program.cs
rename to Subsurface/Source/Program.cs
diff --git a/Subsurface/Properties.cs b/Subsurface/Source/Properties.cs
similarity index 100%
rename from Subsurface/Properties.cs
rename to Subsurface/Source/Properties.cs
diff --git a/Subsurface/Screens/EditCharacterScreen.cs b/Subsurface/Source/Screens/EditCharacterScreen.cs
similarity index 100%
rename from Subsurface/Screens/EditCharacterScreen.cs
rename to Subsurface/Source/Screens/EditCharacterScreen.cs
diff --git a/Subsurface/Screens/EditMapScreen.cs b/Subsurface/Source/Screens/EditMapScreen.cs
similarity index 97%
rename from Subsurface/Screens/EditMapScreen.cs
rename to Subsurface/Source/Screens/EditMapScreen.cs
index d6fa34720..326d199ef 100644
--- a/Subsurface/Screens/EditMapScreen.cs
+++ b/Subsurface/Source/Screens/EditMapScreen.cs
@@ -1,302 +1,302 @@
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Input;
-using System;
-
-namespace Subsurface
-{
-    class EditMapScreen : Screen
-    {
-        Camera cam;
-
-        GUIComponent GUIpanel;
-
-        GUIComponent[] GUItabs;
-        int selectedTab;
-
-        //a character used for picking up and manipulating items
-        Character dummyCharacter;
-        
-        bool characterMode;
-
-        public Camera Cam
-        {
-            get { return cam; }
-        }
-
-        public EditMapScreen()
-        {
-            cam = new Camera(); 
-            cam.Translate(new Vector2(-10.0f, 50.0f));
-
-            selectedTab = -1;
-
-            GUIpanel = new GUIFrame(new Rectangle(0,0, 120, Game1.GraphicsHeight), Color.DarkGray*0.8f);
-            GUIpanel.Padding = new Vector4(10.0f, 10.0f, 10.0f, 10.0f);
-            //GUIListBox constructionList = new GUIListBox(new Rectangle(0, 0, 0, 300), Color.White * 0.7f, GUIpanel);
-            //constructionList.OnSelected = MapEntityPrefab.SelectPrefab;
-            //constructionList.CheckSelected = MapEntityPrefab.GetSelected;
-
-            GUIButton button = new GUIButton(new Rectangle(0, 50, 100, 20), "Items", Alignment.Left, GUI.style, GUIpanel);
-            button.UserData = 0;
-            button.OnClicked = SelectTab;
-
-            button = new GUIButton(new Rectangle(0, 80, 100, 20), "Structures", Alignment.Left, GUI.style, GUIpanel);
-            button.UserData = 1;
-            button.OnClicked = SelectTab;
-
-            button = new GUIButton(new Rectangle(0, 140, 100, 20), "Character mode", Alignment.Left, GUI.style, GUIpanel);
-            button.OnClicked = ToggleCharacterMode;
-            
-            GUItabs = new GUIComponent[2];
-            int width = 400, height = 400;
-            GUItabs[0] = new GUIFrame(new Rectangle(Game1.GraphicsWidth/2-width/2, Game1.GraphicsHeight/2-height/2, width, height), Color.DarkGray*0.8f);
-            GUItabs[0].Padding = new Vector4(10.0f, 10.0f, 10.0f, 10.0f);
-            GUIListBox itemList = new GUIListBox(new Rectangle(0, 0, 0, 0), Color.White * 0.7f, GUI.style, GUItabs[0]);
-            itemList.OnSelected = SelectPrefab;
-            itemList.CheckSelected = MapEntityPrefab.GetSelected;
-            
-            GUItabs[1] = new GUIFrame(new Rectangle(Game1.GraphicsWidth / 2 - width / 2, Game1.GraphicsHeight / 2 - height / 2, width, height), Color.DarkGray * 0.8f);
-            GUItabs[1].Padding = new Vector4(10.0f, 10.0f, 10.0f, 10.0f);
-            GUIListBox structureList = new GUIListBox(new Rectangle(0, 0, 0, 300), Color.White * 0.7f, GUI.style, GUItabs[1]);
-            structureList.OnSelected = SelectPrefab;
-            structureList.CheckSelected = MapEntityPrefab.GetSelected;
-
-            foreach (MapEntityPrefab ep in MapEntityPrefab.list)
-            {
-                GUIListBox parent = ((ep as ItemPrefab) == null) ? structureList : itemList;
-                Color color = ((parent.CountChildren % 2) == 0) ? Color.White : Color.LightGray;
-                
-                GUIFrame frame = new GUIFrame(new Rectangle(0, 0, 0, 50), Color.Transparent, null, parent);
-                frame.UserData = ep;
-                frame.Padding = new Vector4(5.0f, 5.0f, 5.0f, 5.0f);
-                frame.Color = color;
-                frame.HoverColor = Color.Gold * 0.2f;
-                frame.SelectedColor = Color.Gold * 0.5f;
-
-                GUITextBlock textBlock = new GUITextBlock(
-                    new Rectangle(40, 0, 0, 25),
-                    ep.Name,
-                    Color.Transparent, Color.Black,
-                    Alignment.Left, Alignment.Left,
-                    null, frame);
-                textBlock.Padding = new Vector4(5.0f, 0.0f, 5.0f, 0.0f);
-
-                if (ep.sprite != null)
-                {
-                    GUIImage img = new GUIImage(new Rectangle(0, 0, 40, 40), ep.sprite, Alignment.Left, frame);
-                    img.Scale = Math.Min(Math.Min(40.0f / img.SourceRect.Width, 40.0f / img.SourceRect.Height), 1.0f);
-                }
-            }
-        }
-
-        public override void Select()
-        {
-            base.Select();
-            
-            GUIComponent.MouseOn = null;
-            characterMode = false;
-             //CreateDummyCharacter();
-        }
-
-        public override void Deselect()
-        {
-            base.Deselect();
-
-            GUIComponent.MouseOn = null;
-
-            if (dummyCharacter != null)
-            {
-                dummyCharacter.Remove();
-                dummyCharacter = null;
-                Game1.World.ProcessChanges();
-            }
-        }
-
-        private void CreateDummyCharacter()
-        {
-            if (dummyCharacter != null) dummyCharacter.Remove();
-
-            dummyCharacter = new Character(Character.HumanConfigFile, Vector2.Zero);
-            Character.Controlled = dummyCharacter;
-            Game1.World.ProcessChanges();
-        }
-
-        private bool SelectTab(GUIButton button, object obj)
-        {
-            selectedTab = (int)obj;
-            return true;
-        }
-        
-        private bool ToggleCharacterMode(GUIButton button, object obj)
-        {
-            characterMode = !characterMode;         
-            button.Color = (characterMode) ? Color.Gold : Color.White;
-
-            if (characterMode)
-            {
-                CreateDummyCharacter();
-            }
-            else if (dummyCharacter != null)
-            {     
-                dummyCharacter.Remove();
-                dummyCharacter = null;
-            }
-
-            foreach (MapEntity me in MapEntity.mapEntityList)
-            {
-                me.IsHighlighted = false;
-                me.IsSelected = false;
-            }
-            
-            return true;
-        }
-
-        private bool SelectPrefab(object obj)
-        {
-            MapEntityPrefab.SelectPrefab(obj);
-            selectedTab = -1;
-            GUIComponent.MouseOn = null;
-            return true;
-        }
-
-
-        /// <summary>
-        /// Allows the game to run logic such as updating the world,
-        /// checking for collisions, gathering input, and playing audio.
-        /// </summary>
-        /// <param name="gameTime">Provides a snapshot of timing values.</param>
-        public override void Update(double deltaTime)
-        {
-            //Vector2 mousePosition = new Vector2(PlayerInput.GetMouseState.X, PlayerInput.GetMouseState.Y);
-            //mousePosition = cam.ScreenToWorld(mousePosition);
-
-            //if (!Character.characterList.Contains(dummyCharacter))
-            //{
-            //    CreateDummyCharacter();
-            //}
-
-            cam.MoveCamera((float)deltaTime);
-            cam.Zoom = MathHelper.Clamp(cam.Zoom + PlayerInput.ScrollWheelSpeed/1000.0f,0.1f, 2.0f);
-
-            if (characterMode)
-            {
-                foreach (MapEntity me in MapEntity.mapEntityList)
-                {
-                    me.IsHighlighted = false;
-                }
-
-                if (dummyCharacter.SelectedConstruction==null)
-                {
-                    Vector2 mouseSimPos = FarseerPhysics.ConvertUnits.ToSimUnits(cam.ScreenToWorld(PlayerInput.MousePosition));
-                    foreach (Limb limb in dummyCharacter.AnimController.limbs)
-                    {
-                        limb.body.SetTransform(mouseSimPos, 0.0f);
-                    }
-                }
-
-                dummyCharacter.ControlLocalPlayer(cam, false);
-                dummyCharacter.Control((float)deltaTime, cam);
-            }
-            else
-            {
-
-                MapEntity.UpdateSelecting(cam);
-            }
-
-
-            GUIpanel.Update((float)deltaTime);
-            if (selectedTab > -1)
-            {
-                GUItabs[selectedTab].Update((float)deltaTime);
-                if (PlayerInput.RightButtonClicked()) selectedTab = -1;
-            }
-        }
-
-        /// <summary>
-        /// This is called when the game should draw itself.
-        /// </summary>
-        /// <param name="gameTime">Provides a snapshot of timing values.</param>
-        public override void Draw(double deltaTime, GraphicsDevice graphics, SpriteBatch spriteBatch)
-        {
-            //cam.UpdateTransform();
-
-            spriteBatch.Begin(SpriteSortMode.BackToFront,
-                BlendState.AlphaBlend,
-                null, null, null, null,
-                cam.Transform);
-
-            graphics.Clear(new Color(0.051f, 0.149f, 0.271f, 1.0f));
-
-            Submarine.Draw(spriteBatch, true);
-
-            if (!characterMode)
-            {
-                if (MapEntityPrefab.Selected != null) MapEntityPrefab.Selected.UpdatePlacing(spriteBatch, cam);
-
-                MapEntity.DrawSelecting(spriteBatch, cam);
-            }
-            
-            spriteBatch.End();
-
-            //-------------------- HUD -----------------------------
-
-            spriteBatch.Begin();
-
-            GUIpanel.Draw(spriteBatch);
-
-            if (selectedTab > -1) GUItabs[selectedTab].Draw(spriteBatch);
-            
-            GUI.Draw((float)deltaTime, spriteBatch, cam);
-
-            //EntityPrefab.DrawList(spriteBatch, new Vector2(20,50));
-
-
-
-            if (characterMode)
-            {
-                if (dummyCharacter != null)                     
-                {
-                    foreach (Item item in dummyCharacter.SelectedItems)
-                    {
-                        if (item == null) continue;
-                        item.SetTransform(dummyCharacter.SimPosition, 0.0f);
-
-                        item.Update(cam, (float)deltaTime);
-                    }
-
-                    if (dummyCharacter.SelectedConstruction != null)
-                    {
-                        if (dummyCharacter.SelectedConstruction == dummyCharacter.ClosestItem)
-                        {
-                            dummyCharacter.SelectedConstruction.DrawHUD(spriteBatch, dummyCharacter);
-                        }
-                        else
-                        {
-                            dummyCharacter.SelectedConstruction = null;
-                        }
-                    }
-
-                }
-
-                if (PlayerInput.GetMouseState.LeftButton != ButtonState.Pressed)
-                {
-                    //if (Inventory.draggingItem!=null)
-                    //{
-                    //    Inventory.draggingItem.see
-                    //}
-                    Inventory.draggingItem = null;
-                }
-            }
-            else
-            {
-                MapEntity.Edit(spriteBatch, cam);
-            }
-
-
-                                              
-            spriteBatch.End();
-
-        }
-    }
-}
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Input;
+using System;
+
+namespace Subsurface
+{
+    class EditMapScreen : Screen
+    {
+        Camera cam;
+
+        GUIComponent GUIpanel;
+
+        GUIComponent[] GUItabs;
+        int selectedTab;
+
+        //a character used for picking up and manipulating items
+        Character dummyCharacter;
+        
+        bool characterMode;
+
+        public Camera Cam
+        {
+            get { return cam; }
+        }
+
+        public EditMapScreen()
+        {
+            cam = new Camera(); 
+            cam.Translate(new Vector2(-10.0f, 50.0f));
+
+            selectedTab = -1;
+
+            GUIpanel = new GUIFrame(new Rectangle(0,0, 120, Game1.GraphicsHeight), Color.DarkGray*0.8f);
+            GUIpanel.Padding = new Vector4(10.0f, 10.0f, 10.0f, 10.0f);
+            //GUIListBox constructionList = new GUIListBox(new Rectangle(0, 0, 0, 300), Color.White * 0.7f, GUIpanel);
+            //constructionList.OnSelected = MapEntityPrefab.SelectPrefab;
+            //constructionList.CheckSelected = MapEntityPrefab.GetSelected;
+
+            GUIButton button = new GUIButton(new Rectangle(0, 50, 100, 20), "Items", Alignment.Left, GUI.style, GUIpanel);
+            button.UserData = 0;
+            button.OnClicked = SelectTab;
+
+            button = new GUIButton(new Rectangle(0, 80, 100, 20), "Structures", Alignment.Left, GUI.style, GUIpanel);
+            button.UserData = 1;
+            button.OnClicked = SelectTab;
+
+            button = new GUIButton(new Rectangle(0, 140, 100, 20), "Character mode", Alignment.Left, GUI.style, GUIpanel);
+            button.OnClicked = ToggleCharacterMode;
+            
+            GUItabs = new GUIComponent[2];
+            int width = 400, height = 400;
+            GUItabs[0] = new GUIFrame(new Rectangle(Game1.GraphicsWidth/2-width/2, Game1.GraphicsHeight/2-height/2, width, height), Color.DarkGray*0.8f);
+            GUItabs[0].Padding = new Vector4(10.0f, 10.0f, 10.0f, 10.0f);
+            GUIListBox itemList = new GUIListBox(new Rectangle(0, 0, 0, 0), Color.White * 0.7f, GUI.style, GUItabs[0]);
+            itemList.OnSelected = SelectPrefab;
+            itemList.CheckSelected = MapEntityPrefab.GetSelected;
+            
+            GUItabs[1] = new GUIFrame(new Rectangle(Game1.GraphicsWidth / 2 - width / 2, Game1.GraphicsHeight / 2 - height / 2, width, height), Color.DarkGray * 0.8f);
+            GUItabs[1].Padding = new Vector4(10.0f, 10.0f, 10.0f, 10.0f);
+            GUIListBox structureList = new GUIListBox(new Rectangle(0, 0, 0, 300), Color.White * 0.7f, GUI.style, GUItabs[1]);
+            structureList.OnSelected = SelectPrefab;
+            structureList.CheckSelected = MapEntityPrefab.GetSelected;
+
+            foreach (MapEntityPrefab ep in MapEntityPrefab.list)
+            {
+                GUIListBox parent = ((ep as ItemPrefab) == null) ? structureList : itemList;
+                Color color = ((parent.CountChildren % 2) == 0) ? Color.White : Color.LightGray;
+                
+                GUIFrame frame = new GUIFrame(new Rectangle(0, 0, 0, 50), Color.Transparent, null, parent);
+                frame.UserData = ep;
+                frame.Padding = new Vector4(5.0f, 5.0f, 5.0f, 5.0f);
+                frame.Color = color;
+                frame.HoverColor = Color.Gold * 0.2f;
+                frame.SelectedColor = Color.Gold * 0.5f;
+
+                GUITextBlock textBlock = new GUITextBlock(
+                    new Rectangle(40, 0, 0, 25),
+                    ep.Name,
+                    Color.Transparent, Color.Black,
+                    Alignment.Left, Alignment.Left,
+                    null, frame);
+                textBlock.Padding = new Vector4(5.0f, 0.0f, 5.0f, 0.0f);
+
+                if (ep.sprite != null)
+                {
+                    GUIImage img = new GUIImage(new Rectangle(0, 0, 40, 40), ep.sprite, Alignment.Left, frame);
+                    img.Scale = Math.Min(Math.Min(40.0f / img.SourceRect.Width, 40.0f / img.SourceRect.Height), 1.0f);
+                }
+            }
+        }
+
+        public override void Select()
+        {
+            base.Select();
+            
+            GUIComponent.MouseOn = null;
+            characterMode = false;
+             //CreateDummyCharacter();
+        }
+
+        public override void Deselect()
+        {
+            base.Deselect();
+
+            GUIComponent.MouseOn = null;
+
+            if (dummyCharacter != null)
+            {
+                dummyCharacter.Remove();
+                dummyCharacter = null;
+                Game1.World.ProcessChanges();
+            }
+        }
+
+        private void CreateDummyCharacter()
+        {
+            if (dummyCharacter != null) dummyCharacter.Remove();
+
+            dummyCharacter = new Character(Character.HumanConfigFile, Vector2.Zero);
+            Character.Controlled = dummyCharacter;
+            Game1.World.ProcessChanges();
+        }
+
+        private bool SelectTab(GUIButton button, object obj)
+        {
+            selectedTab = (int)obj;
+            return true;
+        }
+        
+        private bool ToggleCharacterMode(GUIButton button, object obj)
+        {
+            characterMode = !characterMode;         
+            button.Color = (characterMode) ? Color.Gold : Color.White;
+
+            if (characterMode)
+            {
+                CreateDummyCharacter();
+            }
+            else if (dummyCharacter != null)
+            {     
+                dummyCharacter.Remove();
+                dummyCharacter = null;
+            }
+
+            foreach (MapEntity me in MapEntity.mapEntityList)
+            {
+                me.IsHighlighted = false;
+                me.IsSelected = false;
+            }
+            
+            return true;
+        }
+
+        private bool SelectPrefab(object obj)
+        {
+            MapEntityPrefab.SelectPrefab(obj);
+            selectedTab = -1;
+            GUIComponent.MouseOn = null;
+            return true;
+        }
+
+
+        /// <summary>
+        /// Allows the game to run logic such as updating the world,
+        /// checking for collisions, gathering input, and playing audio.
+        /// </summary>
+        /// <param name="gameTime">Provides a snapshot of timing values.</param>
+        public override void Update(double deltaTime)
+        {
+            //Vector2 mousePosition = new Vector2(PlayerInput.GetMouseState.X, PlayerInput.GetMouseState.Y);
+            //mousePosition = cam.ScreenToWorld(mousePosition);
+
+            //if (!Character.characterList.Contains(dummyCharacter))
+            //{
+            //    CreateDummyCharacter();
+            //}
+
+            cam.MoveCamera((float)deltaTime);
+            cam.Zoom = MathHelper.Clamp(cam.Zoom + PlayerInput.ScrollWheelSpeed/1000.0f,0.1f, 2.0f);
+
+            if (characterMode)
+            {
+                foreach (MapEntity me in MapEntity.mapEntityList)
+                {
+                    me.IsHighlighted = false;
+                }
+
+                if (dummyCharacter.SelectedConstruction==null)
+                {
+                    Vector2 mouseSimPos = FarseerPhysics.ConvertUnits.ToSimUnits(cam.ScreenToWorld(PlayerInput.MousePosition));
+                    foreach (Limb limb in dummyCharacter.AnimController.limbs)
+                    {
+                        limb.body.SetTransform(mouseSimPos, 0.0f);
+                    }
+                }
+
+                dummyCharacter.ControlLocalPlayer(cam, false);
+                dummyCharacter.Control((float)deltaTime, cam);
+            }
+            else
+            {
+
+                MapEntity.UpdateSelecting(cam);
+            }
+
+
+            GUIpanel.Update((float)deltaTime);
+            if (selectedTab > -1)
+            {
+                GUItabs[selectedTab].Update((float)deltaTime);
+                if (PlayerInput.RightButtonClicked()) selectedTab = -1;
+            }
+        }
+
+        /// <summary>
+        /// This is called when the game should draw itself.
+        /// </summary>
+        /// <param name="gameTime">Provides a snapshot of timing values.</param>
+        public override void Draw(double deltaTime, GraphicsDevice graphics, SpriteBatch spriteBatch)
+        {
+            //cam.UpdateTransform();
+
+            spriteBatch.Begin(SpriteSortMode.BackToFront,
+                BlendState.AlphaBlend,
+                null, null, null, null,
+                cam.Transform);
+
+            graphics.Clear(new Color(0.051f, 0.149f, 0.271f, 1.0f));
+
+            Submarine.Draw(spriteBatch, true);
+
+            if (!characterMode)
+            {
+                if (MapEntityPrefab.Selected != null) MapEntityPrefab.Selected.UpdatePlacing(spriteBatch, cam);
+
+                MapEntity.DrawSelecting(spriteBatch, cam);
+            }
+            
+            spriteBatch.End();
+
+            //-------------------- HUD -----------------------------
+
+            spriteBatch.Begin();
+
+            GUIpanel.Draw(spriteBatch);
+
+            if (selectedTab > -1) GUItabs[selectedTab].Draw(spriteBatch);
+            
+            GUI.Draw((float)deltaTime, spriteBatch, cam);
+
+            //EntityPrefab.DrawList(spriteBatch, new Vector2(20,50));
+
+
+
+            if (characterMode)
+            {
+                if (dummyCharacter != null)                     
+                {
+                    foreach (Item item in dummyCharacter.SelectedItems)
+                    {
+                        if (item == null) continue;
+                        item.SetTransform(dummyCharacter.SimPosition, 0.0f);
+
+                        item.Update(cam, (float)deltaTime);
+                    }
+
+                    if (dummyCharacter.SelectedConstruction != null)
+                    {
+                        if (dummyCharacter.SelectedConstruction == dummyCharacter.ClosestItem)
+                        {
+                            dummyCharacter.SelectedConstruction.DrawHUD(spriteBatch, dummyCharacter);
+                        }
+                        else
+                        {
+                            dummyCharacter.SelectedConstruction = null;
+                        }
+                    }
+
+                }
+
+                if (PlayerInput.GetMouseState.LeftButton != ButtonState.Pressed)
+                {
+                    //if (Inventory.draggingItem!=null)
+                    //{
+                    //    Inventory.draggingItem.see
+                    //}
+                    Inventory.draggingItem = null;
+                }
+            }
+            else
+            {
+                MapEntity.Edit(spriteBatch, cam);
+            }
+
+
+                                              
+            spriteBatch.End();
+
+        }
+    }
+}
diff --git a/Subsurface/Screens/GameScreen.cs b/Subsurface/Source/Screens/GameScreen.cs
similarity index 99%
rename from Subsurface/Screens/GameScreen.cs
rename to Subsurface/Source/Screens/GameScreen.cs
index 2e248c9ce..5aa1faa04 100644
--- a/Subsurface/Screens/GameScreen.cs
+++ b/Subsurface/Source/Screens/GameScreen.cs
@@ -55,7 +55,7 @@ namespace Subsurface
 
             AmbientSoundManager.Update();
 
-            //if (Game1.GameSession!=null && Game1.GameSession.Level != null)
+            //if (Game1.GameSession != null && Game1.GameSession.Level != null)
             //{
             //    Vector2 targetMovement = Vector2.Zero;
             //    if (PlayerInput.KeyDown(Keys.I)) targetMovement.Y += 1.0f;
@@ -63,7 +63,7 @@ namespace Subsurface
             //    if (PlayerInput.KeyDown(Keys.J)) targetMovement.X -= 1.0f;
             //    if (PlayerInput.KeyDown(Keys.L)) targetMovement.X += 1.0f;
 
-            //    Game1.GameSession.Submarine.ApplyForce(targetMovement*100000.0f);
+            //    Game1.GameSession.Submarine.ApplyForce(targetMovement * 100000.0f);
             //}
 
             if (Game1.GameSession!=null) Game1.GameSession.Update((float)deltaTime);
diff --git a/Subsurface/Screens/LobbyScreen.cs b/Subsurface/Source/Screens/LobbyScreen.cs
similarity index 98%
rename from Subsurface/Screens/LobbyScreen.cs
rename to Subsurface/Source/Screens/LobbyScreen.cs
index 835775c0e..ef49403e9 100644
--- a/Subsurface/Screens/LobbyScreen.cs
+++ b/Subsurface/Source/Screens/LobbyScreen.cs
@@ -31,6 +31,8 @@ namespace Subsurface
 
         Level selectedLevel;
 
+        float mapZoom = 3.0f;
+
         private string CostTextGetter()
         {
             return "Cost: "+selectedItemCost.ToString();
@@ -147,6 +149,8 @@ namespace Subsurface
 
             gameMode = Game1.GameSession.gameMode as SinglePlayerMode;
 
+            selectedRightPanel = (int)PanelTab.Crew;
+
             //Map.Unload();
 
             UpdateCharacterLists();            
@@ -188,6 +192,8 @@ namespace Subsurface
 
         public override void Deselect()
         {
+            SelectLocation(null,null);
+
             base.Deselect();
         }
 
@@ -200,6 +206,8 @@ namespace Subsurface
             locationPanel = new GUIFrame(new Rectangle(0, 0, 200, 190), Color.Transparent, Alignment.TopRight, null, rightPanel[(int)PanelTab.Map]);
             locationPanel.UserData = "selectedlocation";
 
+            if (location == null) return;
+
             new GUITextBlock(new Rectangle(0,0,0,0), location.Name, Color.Transparent, Color.White, Alignment.TopLeft, null, locationPanel);
 
             if (Game1.GameSession.Map.SelectedConnection != null && Game1.GameSession.Map.SelectedConnection.Quest != null)
@@ -319,6 +327,9 @@ namespace Subsurface
 
             leftPanel.Update((float)deltaTime);
             rightPanel[selectedRightPanel].Update((float)deltaTime);
+
+            mapZoom += PlayerInput.ScrollWheelSpeed / 1000.0f;
+            mapZoom = MathHelper.Clamp(mapZoom, 1.0f, 4.0f);
             //shiftPanel.Update((float)deltaTime);
         }
 
@@ -346,7 +357,7 @@ namespace Subsurface
                     rightPanel[selectedRightPanel].Rect.X + 20, 
                     rightPanel[selectedRightPanel].Rect.Y + 20,
                     rightPanel[selectedRightPanel].Rect.Width - 280, 
-                    rightPanel[selectedRightPanel].Rect.Height - 40), 3.0f);
+                    rightPanel[selectedRightPanel].Rect.Height - 40), mapZoom);
             }
      
             if (rightPanel[(int)selectedRightPanel].UserData as Location != Game1.GameSession.Map.CurrentLocation)
diff --git a/Subsurface/Screens/MainMenu.cs b/Subsurface/Source/Screens/MainMenu.cs
similarity index 59%
rename from Subsurface/Screens/MainMenu.cs
rename to Subsurface/Source/Screens/MainMenu.cs
index 0bd277acc..8ea5324b3 100644
--- a/Subsurface/Screens/MainMenu.cs
+++ b/Subsurface/Source/Screens/MainMenu.cs
@@ -3,6 +3,7 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Subsurface.Networking;
 using System.IO;
+using System.Xml.Linq;
 
 namespace Subsurface
 {
@@ -15,9 +16,9 @@ namespace Subsurface
 
         private GUIListBox saveList;
 
-        private GUITextBox seedBox;
+        private GUITextBox saveNameBox, seedBox;
 
-        private GUITextBox nameBox, ipBox;
+        private GUITextBox clientNameBox, ipBox;
 
         private GUITextBox serverNameBox, portBox;
 
@@ -82,9 +83,16 @@ namespace Subsurface
             if (Submarine.SavedSubmarines.Count > 0) mapList.Select(Submarine.SavedSubmarines[0]);
 
             new GUITextBlock(new Rectangle((int)(mapList.Rect.Width + 20), 30, 100, 20),
-                "Map Seed: ", GUI.style, Alignment.Left, Alignment.TopLeft, menuTabs[(int)Tabs.NewGame]);
+                "Save name: ", GUI.style, Alignment.Left, Alignment.Left, menuTabs[(int)Tabs.NewGame]);
 
-            seedBox = new GUITextBox(new Rectangle((int)(mapList.Rect.Width + 20), 60, 180, 20),
+            saveNameBox = new GUITextBox(new Rectangle((int)(mapList.Rect.Width + 20), 60, 180, 20),
+                Alignment.TopLeft, GUI.style, menuTabs[(int)Tabs.NewGame]);
+            saveNameBox.Text = SaveUtil.CreateSavePath();
+
+            new GUITextBlock(new Rectangle((int)(mapList.Rect.Width + 20), 90, 100, 20),
+                "Map Seed: ", GUI.style, Alignment.Left, Alignment.Left, menuTabs[(int)Tabs.NewGame]);
+
+            seedBox = new GUITextBox(new Rectangle((int)(mapList.Rect.Width + 20), 120, 180, 20),
                 Alignment.TopLeft, GUI.style, menuTabs[(int)Tabs.NewGame]);
             seedBox.Text = ToolBox.RandomSeed(8);
 
@@ -97,41 +105,41 @@ namespace Subsurface
             menuTabs[(int)Tabs.LoadGame] = new GUIFrame(panelRect, GUI.style);
             //menuTabs[(int)Tabs.LoadGame].Padding = GUI.style.smallPadding;
 
-            new GUITextBlock(new Rectangle(0, 0, 0, 30), "Load Game", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.LoadGame]);
+            //new GUITextBlock(new Rectangle(0, 0, 0, 30), "Load Game", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.LoadGame]);
 
-            if (!Directory.Exists(SaveUtil.SaveFolder))
-            {
-                DebugConsole.ThrowError("Save folder ''"+SaveUtil.SaveFolder+" not found! Attempting to create a new folder");
-                try
-                {
-                    Directory.CreateDirectory(SaveUtil.SaveFolder);
-                }
-                catch (Exception e)
-                {
-                    DebugConsole.ThrowError("Failed to create the folder ''"+SaveUtil.SaveFolder+"''!", e);
-                }
-            }
+            ////if (!Directory.Exists(SaveUtil.SaveFolder))
+            ////{
+            ////    DebugConsole.ThrowError("Save folder ''"+SaveUtil.SaveFolder+" not found! Attempting to create a new folder");
+            ////    try
+            ////    {
+            ////        Directory.CreateDirectory(SaveUtil.SaveFolder);
+            ////    }
+            ////    catch (Exception e)
+            ////    {
+            ////        DebugConsole.ThrowError("Failed to create the folder ''"+SaveUtil.SaveFolder+"''!", e);
+            ////    }
+            ////}
 
-            string[] saveFiles = Directory.GetFiles(SaveUtil.SaveFolder, "*.save");
+            //string[] saveFiles = SaveUtil.GetSaveFiles();//Directory.GetFiles(SaveUtil.SaveFolder, "*.save");
 
-            //new GUITextBlock(new Rectangle(0, 30, 0, 30), "Selected map:", Color.Transparent, Color.Black, Alignment.Left, menuTabs[(int)Tabs.NewGame]);
-            saveList = new GUIListBox(new Rectangle(0, 60, 200, 360), Color.White, GUI.style, menuTabs[(int)Tabs.LoadGame]);
+            ////new GUITextBlock(new Rectangle(0, 30, 0, 30), "Selected map:", Color.Transparent, Color.Black, Alignment.Left, menuTabs[(int)Tabs.NewGame]);
+            //saveList = new GUIListBox(new Rectangle(0, 60, 200, 360), Color.White, GUI.style, menuTabs[(int)Tabs.LoadGame]);
 
-            foreach (string saveFile in saveFiles)
-            {
-                GUITextBlock textBlock = new GUITextBlock(
-                    new Rectangle(0, 0, 0, 25),
-                    saveFile,
-                    GUI.style,
-                    Alignment.Left,
-                    Alignment.Left,
-                    saveList);
-                textBlock.Padding = new Vector4(10.0f, 0.0f, 0.0f, 0.0f);
-                textBlock.UserData = saveFile;
-            }
+            //foreach (string saveFile in saveFiles)
+            //{
+            //    GUITextBlock textBlock = new GUITextBlock(
+            //        new Rectangle(0, 0, 0, 25),
+            //        saveFile,
+            //        GUI.style,
+            //        Alignment.Left,
+            //        Alignment.Left,
+            //        saveList);
+            //    textBlock.Padding = new Vector4(10.0f, 0.0f, 0.0f, 0.0f);
+            //    textBlock.UserData = saveFile;
+            //}
 
-            button = new GUIButton(new Rectangle(0, 0, 100, 30), "Start",Alignment.Right | Alignment.Bottom, GUI.style, menuTabs[(int)Tabs.LoadGame]);
-            button.OnClicked = LoadGame;
+            //button = new GUIButton(new Rectangle(0, 0, 100, 30), "Start",Alignment.Right | Alignment.Bottom, GUI.style, menuTabs[(int)Tabs.LoadGame]);
+            //button.OnClicked = LoadGame;
 
             //----------------------------------------------------------------------
 
@@ -141,7 +149,7 @@ namespace Subsurface
             new GUITextBlock(new Rectangle(0, 0, 0, 30), "Join Server", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.JoinServer]);
 
             new GUITextBlock(new Rectangle(0, 30, 0, 30), "Name:", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.JoinServer]);
-            nameBox = new GUITextBox(new Rectangle(0, 60, 200, 30), Color.White, Color.Black, Alignment.CenterX, Alignment.CenterX, null, menuTabs[(int)Tabs.JoinServer]);
+            clientNameBox = new GUITextBox(new Rectangle(0, 60, 200, 30), Color.White, Color.Black, Alignment.CenterX, Alignment.CenterX, null, menuTabs[(int)Tabs.JoinServer]);
 
             new GUITextBlock(new Rectangle(0, 100, 0, 30), "Server IP:", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.JoinServer]);
             ipBox = new GUITextBox(new Rectangle(0, 130, 200, 30), Color.White, Color.Black, Alignment.CenterX, Alignment.CenterX, null, menuTabs[(int)Tabs.JoinServer]);
@@ -182,6 +190,8 @@ namespace Subsurface
         {
             selectedTab = (int)obj;
 
+            if (selectedTab == (int)Tabs.LoadGame) UpdateLoadScreen();
+
             this.Select();
             return true;
         }
@@ -194,7 +204,7 @@ namespace Subsurface
             int port;
             if (!int.TryParse(portBox.Text, out port))
             {
-                DebugConsole.ThrowError("ERROR: "+portBox.Text+" is not a valid port. Using the default port "+NetworkMember.DefaultPort);
+                DebugConsole.ThrowError("ERROR: " + portBox.Text + " is not a valid port. Using the default port " + NetworkMember.DefaultPort);
                 port = NetworkMember.DefaultPort;
             }
 
@@ -211,6 +221,109 @@ namespace Subsurface
             return true;
         }
 
+        private void UpdateLoadScreen()
+        {
+            menuTabs[(int)Tabs.LoadGame].ClearChildren();
+
+            new GUITextBlock(new Rectangle(0, 0, 0, 30), "Load Game", GUI.style, Alignment.CenterX, Alignment.CenterX, menuTabs[(int)Tabs.LoadGame]);
+
+            string[] saveFiles = SaveUtil.GetSaveFiles();
+
+            saveList = new GUIListBox(new Rectangle(0, 60, 200, 360), Color.White, GUI.style, menuTabs[(int)Tabs.LoadGame]);
+            saveList.OnSelected = SelectSaveFile;
+
+            foreach (string saveFile in saveFiles)
+            {
+                GUITextBlock textBlock = new GUITextBlock(
+                    new Rectangle(0, 0, 0, 25),
+                    saveFile,
+                    GUI.style,
+                    Alignment.Left,
+                    Alignment.Left,
+                    saveList);
+                textBlock.Padding = new Vector4(10.0f, 0.0f, 0.0f, 0.0f);
+                textBlock.UserData = saveFile;
+            }
+
+            var button = new GUIButton(new Rectangle(0, 0, 100, 30), "Start", Alignment.Right | Alignment.Bottom, GUI.style, menuTabs[(int)Tabs.LoadGame]);
+            button.OnClicked = LoadGame;
+
+            button = new GUIButton(new Rectangle(-20, -20, 100, 30), "Back", Alignment.TopLeft, GUI.style, menuTabs[(int)Tabs.LoadGame]);
+            button.OnClicked = PreviousTab;
+        }
+
+        private bool SelectSaveFile(object obj)
+        {
+            string fileName = (string)obj;
+            
+            XDocument doc = SaveUtil.LoadGameSessionDoc(fileName);
+
+            if (doc==null)
+            {
+                DebugConsole.ThrowError("Error loading save file ''"+fileName+"''. The file may be corrupted.");
+                return false;
+            }
+
+            RemoveSaveFrame();
+
+            string saveTime = ToolBox.GetAttributeString(doc.Root, "savetime", "unknown");
+
+            XElement modeElement = null;
+            foreach (XElement element in doc.Root.Elements())
+            {
+                if (element.Name.ToString().ToLower() != "gamemode") continue;
+
+                modeElement = element;
+                break;
+            }
+
+            string mapseed = ToolBox.GetAttributeString(modeElement, "mapseed", "unknown");
+
+            GUIFrame saveFileFrame = new GUIFrame(new Rectangle((int)(saveList.Rect.Width + 20), 60, 200, 200), Color.Black*0.4f, GUI.style, menuTabs[(int)Tabs.LoadGame]);
+            saveFileFrame.UserData = "savefileframe";
+            saveFileFrame.Padding = new Vector4(20.0f, 20.0f, 20.0f, 20.0f);
+
+            new GUITextBlock(new Rectangle(0,0,0,20), fileName, GUI.style, saveFileFrame);
+
+            new GUITextBlock(new Rectangle(0, 30, 0, 20), "Last saved: ", GUI.style, saveFileFrame).Font = GUI.SmallFont;
+            new GUITextBlock(new Rectangle(15, 45, 0, 20), saveTime, GUI.style, saveFileFrame).Font = GUI.SmallFont;
+
+            new GUITextBlock(new Rectangle(0, 65, 0, 20), "Map seed: ", GUI.style, saveFileFrame).Font = GUI.SmallFont;
+            new GUITextBlock(new Rectangle(15, 80, 0, 20), mapseed, GUI.style, saveFileFrame).Font = GUI.SmallFont;
+
+            var deleteSaveButton = new GUIButton(new Rectangle(0, 0, 100, 20), "Delete", Alignment.BottomCenter, GUI.style, saveFileFrame);
+            deleteSaveButton.UserData = fileName;
+            deleteSaveButton.OnClicked = DeleteSave;
+
+            return true;
+        }
+
+        private bool DeleteSave(GUIButton button, object obj)
+        {
+            string saveFile = obj as string;
+
+            if (obj == null) return false;
+
+            SaveUtil.DeleteSave(saveFile);
+
+            UpdateLoadScreen();
+
+            return true;
+        }
+
+        private void RemoveSaveFrame()
+        {
+            GUIComponent prevFrame = null;
+            foreach (GUIComponent child in menuTabs[(int)Tabs.LoadGame].children)
+            {
+                if (child.UserData as string != "savefileframe") continue;
+
+                prevFrame = child;
+                break;
+            }
+            menuTabs[(int)Tabs.LoadGame].RemoveChild(prevFrame);
+        }
+
         public override void Update(double deltaTime)
         {
             menuTabs[selectedTab].Update((float)deltaTime);
@@ -232,19 +345,36 @@ namespace Subsurface
 
             GUI.Draw((float)deltaTime, spriteBatch, null);
 
+            spriteBatch.DrawString(GUI.Font, "Subsurface v"+Game1.Version, new Vector2(10, Game1.GraphicsHeight-20), Color.White);
+
             spriteBatch.End();
         }
 
         private bool StartGame(GUIButton button, object obj)
         {
-            Submarine selectedMap = mapList.SelectedData as Submarine;
-            if (selectedMap == null) return false;
+            if (string.IsNullOrEmpty(saveNameBox.Text)) return false;
 
-            Game1.GameSession = new GameSession(selectedMap, GameModePreset.list.Find(gm => gm.Name == "Single Player"));
+            string[] existingSaveFiles = SaveUtil.GetSaveFiles();
+
+            if (Array.Find(existingSaveFiles, s => s == saveNameBox.Text)!=null)
+            {
+                new GUIMessageBox("Save name already in use", "Please choose another name for the save file");
+                return false;
+            }
+
+            Submarine selectedSub = mapList.SelectedData as Submarine;
+            if (selectedSub == null) return false;
+
+            Game1.GameSession = new GameSession(selectedSub, saveNameBox.Text, GameModePreset.list.Find(gm => gm.Name == "Single Player"));
             (Game1.GameSession.gameMode as SinglePlayerMode).GenerateMap(seedBox.Text);
 
             Game1.LobbyScreen.Select();
 
+            new GUIMessageBox("Welcome to Subsurface!", "Please note that the single player mode is very unfinished at the moment; "+
+            "for example, the NPCs don't have an AI yet and there are only a couple of different quests to complete. The multiplayer "+
+            "mode should be much more enjoyable to play at the moment, so my recommendation is to try out and get a hang of the game mechanics "+
+            "in the single player mode and then move on to multiplayer. Have fun!\n - Regalis, the main dev of Subsurface", 400, 350);
+
             return true;
         }
 
@@ -280,10 +410,10 @@ namespace Subsurface
 
         private bool JoinServer(GUIButton button, object obj)
         {
-            if (string.IsNullOrEmpty(nameBox.Text)) return false;
+            if (string.IsNullOrEmpty(clientNameBox.Text)) return false;
             if (string.IsNullOrEmpty(ipBox.Text)) return false;
 
-            Game1.NetworkMember = new GameClient(nameBox.Text);
+            Game1.NetworkMember = new GameClient(clientNameBox.Text);
             Game1.Client.ConnectToServer(ipBox.Text);
 
             return true;
diff --git a/Subsurface/Screens/NetLobbyScreen.cs b/Subsurface/Source/Screens/NetLobbyScreen.cs
similarity index 100%
rename from Subsurface/Screens/NetLobbyScreen.cs
rename to Subsurface/Source/Screens/NetLobbyScreen.cs
diff --git a/Subsurface/Screens/Screen.cs b/Subsurface/Source/Screens/Screen.cs
similarity index 100%
rename from Subsurface/Screens/Screen.cs
rename to Subsurface/Source/Screens/Screen.cs
diff --git a/Subsurface/Screens/SettingsScreen.cs b/Subsurface/Source/Screens/SettingsScreen.cs
similarity index 100%
rename from Subsurface/Screens/SettingsScreen.cs
rename to Subsurface/Source/Screens/SettingsScreen.cs
diff --git a/Subsurface/Sounds/AmbientSoundManager.cs b/Subsurface/Source/Sounds/AmbientSoundManager.cs
similarity index 92%
rename from Subsurface/Sounds/AmbientSoundManager.cs
rename to Subsurface/Source/Sounds/AmbientSoundManager.cs
index bcf5e4a6f..0482514c5 100644
--- a/Subsurface/Sounds/AmbientSoundManager.cs
+++ b/Subsurface/Source/Sounds/AmbientSoundManager.cs
@@ -64,9 +64,20 @@ namespace Subsurface
         private static BackgroundMusic targetMusic;
         private static BackgroundMusic[] musicClips;
         private static float musicVolume;
+
+        private static Sound startDrone;
         
         public static IEnumerable<Status> Init()
         {
+
+
+            startDrone = Sound.Load("Content/Sounds/startDrone.ogg");
+            startDrone.Play();
+
+
+            yield return Status.Running;
+
+
             waterAmbience = Sound.Load("Content/Sounds/Water/WaterAmbience.ogg");
             yield return Status.Running;
             flowSounds[0] = Sound.Load("Content/Sounds/Water/FlowSmall.ogg");
@@ -80,6 +91,26 @@ namespace Subsurface
             if (doc == null) yield return Status.Failure;
 
             yield return Status.Running;
+
+            var xMusic = doc.Root.Elements("music").ToList();
+
+            if (xMusic.Any())
+            {
+                musicClips = new BackgroundMusic[xMusic.Count];
+                int i = 0;
+                foreach (XElement element in xMusic)
+                {
+                    string file = ToolBox.GetAttributeString(element, "file", "").ToLower();
+                    string type = ToolBox.GetAttributeString(element, "type", "").ToLower();
+                    Vector2 priority = ToolBox.GetAttributeVector2(element, "priorityrange", new Vector2(0.0f, 100.0f));
+
+                    musicClips[i] = new BackgroundMusic(file, type, priority);
+
+                    yield return Status.Running;
+
+                    i++;
+                }
+            }
             
             var xDamageSounds = doc.Root.Elements("damagesound").ToList();
             
@@ -113,27 +144,8 @@ namespace Subsurface
                 }
             }
 
-            var xMusic = doc.Root.Elements("music").ToList();
-            
-            if (xMusic.Any())
-            {
-                musicClips = new BackgroundMusic[xMusic.Count];
-                int i = 0;
-                foreach (XElement element in xMusic)
-                {
-                    string file = ToolBox.GetAttributeString(element, "file", "").ToLower();
-                    string type = ToolBox.GetAttributeString(element, "type", "").ToLower();
-                    Vector2 priority = ToolBox.GetAttributeVector2(element, "priorityrange", new Vector2(0.0f,100.0f));
-
-                    musicClips[i] = new BackgroundMusic(file, type, priority);
-
-                    yield return Status.Running;
-
-                    i++;
-                }
-            }
-
             yield return Status.Success;
+
         }
         
 
@@ -141,6 +153,15 @@ namespace Subsurface
         {
             UpdateMusic();
 
+            if (startDrone!=null)
+            {
+                if (!SoundManager.IsPlaying(startDrone.AlBufferId))
+                {
+                    startDrone.Remove();
+                    startDrone = null;
+                }
+            }
+
             float ambienceVolume = 0.5f;
             float lowpassHFGain = 1.0f;
             if (Character.Controlled != null)
@@ -161,6 +182,7 @@ namespace Subsurface
 
         private static void UpdateMusic()
         {
+            if (musicClips == null) return;
             
             Task criticalTask = null;
             if (Game1.GameSession!=null)
@@ -177,12 +199,12 @@ namespace Subsurface
             List<BackgroundMusic> suitableMusic = null;
             if (criticalTask == null)
             {
-                suitableMusic = musicClips.Where(x => x.type == "default").ToList();
-
+                suitableMusic = musicClips.Where(x => x != null && x.type == "default").ToList();
             }
             else
             {
                 suitableMusic = musicClips.Where(x =>
+                    x != null &&
                     x.type == criticalTask.MusicType &&
                     x.priorityRange.X < criticalTask.Priority &&
                     x.priorityRange.Y > criticalTask.Priority).ToList();                
diff --git a/Subsurface/Sounds/OggSound.cs b/Subsurface/Source/Sounds/OggSound.cs
similarity index 100%
rename from Subsurface/Sounds/OggSound.cs
rename to Subsurface/Source/Sounds/OggSound.cs
diff --git a/Subsurface/Sounds/OggStream.cs b/Subsurface/Source/Sounds/OggStream.cs
similarity index 100%
rename from Subsurface/Sounds/OggStream.cs
rename to Subsurface/Source/Sounds/OggStream.cs
diff --git a/Subsurface/Sounds/Sound.cs b/Subsurface/Source/Sounds/Sound.cs
similarity index 100%
rename from Subsurface/Sounds/Sound.cs
rename to Subsurface/Source/Sounds/Sound.cs
diff --git a/Subsurface/Sounds/SoundManager.cs b/Subsurface/Source/Sounds/SoundManager.cs
similarity index 99%
rename from Subsurface/Sounds/SoundManager.cs
rename to Subsurface/Source/Sounds/SoundManager.cs
index 6ad81ccda..ef705ba62 100644
--- a/Subsurface/Sounds/SoundManager.cs
+++ b/Subsurface/Source/Sounds/SoundManager.cs
@@ -236,7 +236,7 @@ namespace Subsurface.Sounds
 
         public static bool IsPlaying(int sourceIndex)
         {
-            if (sourceIndex < 1) return false;
+            if (sourceIndex < 1 || sourceIndex>alSources.Count-1) return false;
             var state = AL.GetSourceState(alSources[sourceIndex]);
             return (state == ALSourceState.Playing);
         }
diff --git a/Subsurface/Sprite.cs b/Subsurface/Source/Sprite.cs
similarity index 100%
rename from Subsurface/Sprite.cs
rename to Subsurface/Source/Sprite.cs
diff --git a/Subsurface/Utils/MathUtils.cs b/Subsurface/Source/Utils/MathUtils.cs
similarity index 100%
rename from Subsurface/Utils/MathUtils.cs
rename to Subsurface/Source/Utils/MathUtils.cs
diff --git a/Subsurface/Utils/Rand.cs b/Subsurface/Source/Utils/Rand.cs
similarity index 100%
rename from Subsurface/Utils/Rand.cs
rename to Subsurface/Source/Utils/Rand.cs
diff --git a/Subsurface/Utils/SaveUtil.cs b/Subsurface/Source/Utils/SaveUtil.cs
similarity index 65%
rename from Subsurface/Utils/SaveUtil.cs
rename to Subsurface/Source/Utils/SaveUtil.cs
index 6ec6c17dd..b9111f1ad 100644
--- a/Subsurface/Utils/SaveUtil.cs
+++ b/Subsurface/Source/Utils/SaveUtil.cs
@@ -4,64 +4,147 @@ using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Subsurface
 {
     class SaveUtil
     {
-        public const string SaveFolder = "Content/Data/Saves/";
+        private const string SaveFolder = "Content/Data/Saves/";
 
         public delegate void ProgressDelegate(string sMessage);
 
-        public static void SaveGame(string savePath)
+        public static void SaveGame(string fileName)
         {
-            string tempPath = Path.GetDirectoryName(savePath) + "\\temp";
-            if (!Directory.Exists(tempPath))
+            fileName = SaveFolder + fileName;
+
+            string tempPath = SaveFolder + "\\temp";
+
+
+
+            if (Directory.Exists(tempPath))
             {
-                Directory.CreateDirectory(tempPath);
+                Directory.Delete(tempPath, true);                
             }
 
+            Directory.CreateDirectory(tempPath);
             //Directory.CreateDirectory(Path.GetDirectoryName(filePath) + "\\temp");            
 
-            Submarine.Loaded.SaveAs(tempPath + "\\map.gz");
+            try
+            {
+                if (Submarine.Loaded!=null)
+                {
+                    Submarine.Loaded.SaveAs(tempPath + "\\map.gz");
+                }
+                else
+                {
+                    File.Copy(Game1.GameSession.Submarine.FilePath, tempPath + "\\map.gz");
+                }
+            }
+            catch (Exception e)
+            {
+                DebugConsole.ThrowError("Error saving submarine", e);
+            }
 
-            Game1.GameSession.Save(tempPath + "\\gamesession.xml");
+            try
+            {
+                Game1.GameSession.Save(tempPath + "\\gamesession.xml");
+            }
+
+            catch (Exception e)
+            {
+                DebugConsole.ThrowError("Error saving gamesession", e);
+            }
             //Game1.GameSession.crewManager.Save(directory+"\\crew.xml");
 
-            CompressDirectory(tempPath, savePath, null);
+            CompressDirectory(tempPath, fileName+".save", null);
 
             //Directory.Delete(tempPath, true);
         }
 
-        public static void LoadGame(string filePath)
+        public static void LoadGame(string fileName)
         {
-            string tempPath = Path.GetDirectoryName(filePath) + "\\temp";
+            string filePath = SaveFolder + fileName+".save";
+
+            string tempPath = SaveFolder + "\\temp";
 
             DecompressToDirectory(filePath, tempPath, null);
 
             Submarine selectedMap = Submarine.Load(tempPath +"\\map.gz");
-            Game1.GameSession = new GameSession(selectedMap, filePath, tempPath + "\\gamesession.xml");
+            Game1.GameSession = new GameSession(selectedMap, fileName, tempPath + "\\gamesession.xml");
 
             //Directory.Delete(tempPath, true);
         }
 
-        public static string CreateSavePath(string saveFolder, string fileName="save")
+        public static XDocument LoadGameSessionDoc(string fileName)
         {
-            if (!Directory.Exists(saveFolder))
+            string filePath = SaveFolder + fileName + ".save";
+
+            string tempPath = SaveFolder + "\\temp";
+
+            DecompressToDirectory(filePath, tempPath, null);
+
+            return ToolBox.TryLoadXml(tempPath + "\\gamesession.xml");            
+        }
+
+        public static void DeleteSave(string fileName)
+        {
+            fileName = SaveFolder + fileName + ".save";
+
+            try
             {
-                DebugConsole.ThrowError("Save folder ''"+saveFolder+"'' not found. Created new folder");
-                Directory.CreateDirectory(saveFolder);
+                File.Delete(fileName);
+            }
+
+            catch (Exception e)
+            {
+                DebugConsole.ThrowError("ERROR: deleting save file ''"+fileName+" failed.", e);
+            }
+
+        }
+
+        public static string[] GetSaveFiles()
+        {
+            if (!Directory.Exists(SaveFolder))
+            {
+                DebugConsole.ThrowError("Save folder ''" + SaveFolder + " not found! Attempting to create a new folder");
+                try
+                {
+                    Directory.CreateDirectory(SaveFolder);
+                }
+                catch (Exception e)
+                {
+                    DebugConsole.ThrowError("Failed to create the folder ''" + SaveFolder + "''!", e);
+                }
+            }
+
+            string[] files = Directory.GetFiles(SaveFolder, "*.save");
+
+            for (int i = 0; i < files.Length; i++)
+            {
+                files[i] = Path.GetFileNameWithoutExtension(files[i]);
+            }
+
+            return files;
+        }
+
+        public static string CreateSavePath(string fileName="save")
+        {
+            if (!Directory.Exists(SaveFolder))
+            {
+                DebugConsole.ThrowError("Save folder ''"+SaveFolder+"'' not found. Created new folder");
+                Directory.CreateDirectory(SaveFolder);
             }
 
             string extension = ".save";
 
             int i = 0;
-            while (File.Exists(saveFolder + fileName + i + extension))
+            while (File.Exists(SaveFolder + fileName + i + extension))
             {
                 i++;
             }
 
-            return saveFolder + fileName + i + extension;
+            return fileName + i;
         }
 
         public static void CompressStringToFile(string fileName, string value)
diff --git a/Subsurface/Utils/TextureLoader.cs b/Subsurface/Source/Utils/TextureLoader.cs
similarity index 100%
rename from Subsurface/Utils/TextureLoader.cs
rename to Subsurface/Source/Utils/TextureLoader.cs
diff --git a/Subsurface/Utils/ToolBox.cs b/Subsurface/Source/Utils/ToolBox.cs
similarity index 100%
rename from Subsurface/Utils/ToolBox.cs
rename to Subsurface/Source/Utils/ToolBox.cs
diff --git a/Subsurface/Subsurface.csproj b/Subsurface/Subsurface.csproj
index e61f8a9a1..28a8cb78a 100644
--- a/Subsurface/Subsurface.csproj
+++ b/Subsurface/Subsurface.csproj
@@ -50,167 +50,167 @@
     <ApplicationIcon>Icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Camera.cs" />
-    <Compile Include="Characters\AI\AIController.cs" />
-    <Compile Include="Characters\AI\AITarget.cs" />
-    <Compile Include="Characters\AI\PathFinder.cs" />
-    <Compile Include="Characters\AnimController.cs" />
-    <Compile Include="Characters\Attack.cs" />
-    <Compile Include="Characters\Character.cs" />
-    <Compile Include="Characters\CharacterInfo.cs" />
-    <Compile Include="Characters\AI\ISteerable.cs" />
-    <Compile Include="Characters\DelayedEffect.cs" />
-    <Compile Include="Characters\Jobs\Job.cs" />
-    <Compile Include="Characters\Jobs\JobPrefab.cs" />
-    <Compile Include="Characters\AI\SteeringManager.cs" />
-    <Compile Include="Characters\AI\SteeringPath.cs" />
-    <Compile Include="ContentPackage.cs" />
-    <Compile Include="CoroutineManager.cs" />
-    <Compile Include="Events\Quests\Quest.cs" />
-    <Compile Include="Events\Quests\MonsterQuest.cs" />
-    <Compile Include="Events\Quests\SalvageQuest.cs" />
-    <Compile Include="GameSession\CargoManager.cs" />
-    <Compile Include="GameSession\QuestMode.cs" />
-    <Compile Include="GUI\GUIMessage.cs" />
-    <Compile Include="GUI\TitleScreen.cs" />
-    <Compile Include="Items\Components\Label.cs" />
-    <Compile Include="Items\Components\Signal\SignalCheckComponent.cs" />
-    <Compile Include="Items\FixRequirement.cs" />
-    <Compile Include="Map\Lights\Light.cs" />
-    <Compile Include="Map\LocationType.cs" />
-    <Compile Include="Utils\Rand.cs" />
-    <Compile Include="Events\PropertyTask.cs" />
-    <Compile Include="Events\RepairTask.cs" />
-    <Compile Include="GameSession\CrewManager.cs" />
-    <Compile Include="Characters\AI\EnemyAIController.cs" />
-    <Compile Include="Characters\FishAnimController.cs" />
-    <Compile Include="GameSession\GameMode.cs" />
-    <Compile Include="GameSession\HireManager.cs" />
-    <Compile Include="Characters\HumanoidAnimController.cs" />
-    <Compile Include="GameSession\SinglePlayerMode.cs" />
-    <Compile Include="GameSession\TraitorMode.cs" />
-    <Compile Include="GUI\ComponentStyle.cs" />
-    <Compile Include="GUI\GUIImage.cs" />
-    <Compile Include="GUI\GUIMessageBox.cs" />
-    <Compile Include="GUI\GUITickBox.cs" />
-    <Compile Include="IPropertyObject.cs" />
-    <Compile Include="Items\CharacterInventory.cs" />
-    <Compile Include="Items\Components\Machines\Fabricator.cs" />
-    <Compile Include="Items\Components\Machines\MiniMap.cs" />
-    <Compile Include="Items\Components\Machines\Engine.cs" />
-    <Compile Include="Items\Components\Machines\Pump.cs" />
-    <Compile Include="Items\Components\Machines\Radar.cs" />
-    <Compile Include="Items\Components\Signal\OxygenDetector.cs" />
-    <Compile Include="Items\Components\Signal\LightComponent.cs" />
-    <Compile Include="Items\Components\Signal\NotComponent.cs" />
-    <Compile Include="Items\Components\Signal\OrComponent.cs" />
-    <Compile Include="Items\Components\Signal\AndComponent.cs" />
-    <Compile Include="Items\Components\Signal\ConnectionPanel.cs" />
-    <Compile Include="Items\Components\Signal\RegExFindComponent.cs" />
-    <Compile Include="Items\Components\Machines\Steering.cs" />
-    <Compile Include="Items\Components\Holdable\Throwable.cs" />
-    <Compile Include="Items\Components\Turret.cs" />
-    <Compile Include="Items\Components\Signal\Wire.cs" />
-    <Compile Include="Items\Components\Signal\Connection.cs" />
-    <Compile Include="Items\Inventory.cs" />
-    <Compile Include="Items\ItemInventory.cs" />
-    <Compile Include="Characters\Limb.cs" />
-    <Compile Include="GameSession\GameSession.cs" />
-    <Compile Include="Characters\Ragdoll.cs" />
-    <Compile Include="Characters\StatusEffect.cs" />
-    <Compile Include="DebugConsole.cs" />
-    <Compile Include="Events\ScriptedTask.cs" />
-    <Compile Include="Events\Task.cs" />
-    <Compile Include="Events\TaskManager.cs" />
-    <Compile Include="FrameCounter.cs" />
-    <Compile Include="GUI\GUIStyle.cs" />
-    <Compile Include="GUI\GUITextBox.cs" />
-    <Compile Include="Items\Components\Container.cs" />
-    <Compile Include="Items\Components\Machines\Controller.cs" />
-    <Compile Include="Items\Components\Door.cs" />
-    <Compile Include="Items\Components\Ladder.cs" />
-    <Compile Include="Items\Components\Holdable\Pickable.cs" />
-    <Compile Include="Items\Components\Power\PowerContainer.cs" />
-    <Compile Include="Items\Components\Machines\OxygenGenerator.cs" />
-    <Compile Include="Items\Components\Power\Powered.cs" />
-    <Compile Include="Items\Components\Power\PowerTransfer.cs" />
-    <Compile Include="Items\Components\Holdable\RangedWeapon.cs" />
-    <Compile Include="Items\Components\Machines\Reactor.cs" />
-    <Compile Include="Items\Components\Holdable\RepairTool.cs" />
-    <Compile Include="Items\Components\Machines\Vent.cs" />
-    <Compile Include="Items\RelatedItem.cs" />
-    <Compile Include="Items\Components\Rope.cs" />
-    <Compile Include="Items\Components\Wearable.cs" />
-    <Compile Include="Map\Entity.cs" />
-    <Compile Include="Map\Explosion.cs" />
-    <Compile Include="Map\IDamageable.cs" />
-    <Compile Include="Map\Levels\Level.cs" />
-    <Compile Include="Map\Lights\ConvexHull.cs" />
-    <Compile Include="Map\Lights\LightManager.cs" />
-    <Compile Include="Map\Location.cs" />
-    <Compile Include="Map\Map.cs" />
-    <Compile Include="Map\Md5Hash.cs" />
-    <Compile Include="Map\Levels\Voronoi.cs" />
-    <Compile Include="Map\Levels\VoronoiElements.cs" />
-    <Compile Include="Utils\MathUtils.cs" />
-    <Compile Include="Physics\PhysicsBody.cs" />
-    <Compile Include="Networking\NetworkEvent.cs" />
-    <Compile Include="Networking\NetworkMember.cs" />
-    <Compile Include="Particles\Particle.cs" />
-    <Compile Include="Particles\ParticleManager.cs" />
-    <Compile Include="Particles\ParticlePrefab.cs" />
-    <Compile Include="Physics\Physics.cs" />
-    <Compile Include="Properties.cs" />
-    <Compile Include="Utils\SaveUtil.cs" />
-    <Compile Include="Screens\EditCharacterScreen.cs" />
-    <Compile Include="EventInput\EventInput.cs" />
-    <Compile Include="EventInput\KeyboardDispatcher.cs" />
-    <Compile Include="Screens\EditMapScreen.cs" />
-    <Compile Include="Events\ScriptedEvent.cs" />
-    <Compile Include="Events\MonsterEvent.cs" />
-    <Compile Include="Screens\GameScreen.cs" />
-    <Compile Include="GUI\GUIButton.cs" />
-    <Compile Include="GUI\GUIComponent.cs" />
-    <Compile Include="GUI\GUIFrame.cs" />
-    <Compile Include="GUI\GUIListBox.cs" />
-    <Compile Include="GUI\GUIProgressBar.cs" />
-    <Compile Include="GUI\GUIScrollBar.cs" />
-    <Compile Include="GUI\GUITextBlock.cs" />
-    <Compile Include="Items\Components\Holdable\Holdable.cs" />
-    <Compile Include="Items\Components\ItemComponent.cs" />
-    <Compile Include="Items\ItemPrefab.cs" />
-    <Compile Include="Items\Item.cs" />
-    <Compile Include="Items\Components\Projectile.cs" />
-    <Compile Include="Map\MapEntity.cs" />
-    <Compile Include="Map\MapEntityPrefab.cs" />
-    <Compile Include="Map\Submarine.cs" />
-    <Compile Include="Map\Structure.cs" />
-    <Compile Include="Map\StructurePrefab.cs" />
-    <Compile Include="Map\WaterRenderer.cs" />
-    <Compile Include="Map\WayPoint.cs" />
-    <Compile Include="Networking\GameClient.cs" />
-    <Compile Include="Networking\GameServer.cs" />
-    <Compile Include="PlayerInput.cs" />
-    <Compile Include="Map\Gap.cs" />
-    <Compile Include="Game1.cs" />
-    <Compile Include="GUI\GUI.cs" />
-    <Compile Include="Program.cs" />
+    <Compile Include="Source\Camera.cs" />
+    <Compile Include="Source\Characters\AI\AIController.cs" />
+    <Compile Include="Source\Characters\AI\AITarget.cs" />
+    <Compile Include="Source\Characters\AI\PathFinder.cs" />
+    <Compile Include="Source\Characters\AnimController.cs" />
+    <Compile Include="Source\Characters\Attack.cs" />
+    <Compile Include="Source\Characters\Character.cs" />
+    <Compile Include="Source\Characters\CharacterInfo.cs" />
+    <Compile Include="Source\Characters\AI\ISteerable.cs" />
+    <Compile Include="Source\Characters\DelayedEffect.cs" />
+    <Compile Include="Source\Characters\Jobs\Job.cs" />
+    <Compile Include="Source\Characters\Jobs\JobPrefab.cs" />
+    <Compile Include="Source\Characters\AI\SteeringManager.cs" />
+    <Compile Include="Source\Characters\AI\SteeringPath.cs" />
+    <Compile Include="Source\ContentPackage.cs" />
+    <Compile Include="Source\CoroutineManager.cs" />
+    <Compile Include="Source\Events\Quests\Quest.cs" />
+    <Compile Include="Source\Events\Quests\MonsterQuest.cs" />
+    <Compile Include="Source\Events\Quests\SalvageQuest.cs" />
+    <Compile Include="Source\GameSession\CargoManager.cs" />
+    <Compile Include="Source\GameSession\QuestMode.cs" />
+    <Compile Include="Source\GUI\GUIMessage.cs" />
+    <Compile Include="Source\GUI\TitleScreen.cs" />
+    <Compile Include="Source\Items\Components\Label.cs" />
+    <Compile Include="Source\Items\Components\Signal\SignalCheckComponent.cs" />
+    <Compile Include="Source\Items\FixRequirement.cs" />
+    <Compile Include="Source\Map\Lights\Light.cs" />
+    <Compile Include="Source\Map\LocationType.cs" />
+    <Compile Include="Source\Utils\Rand.cs" />
+    <Compile Include="Source\Events\PropertyTask.cs" />
+    <Compile Include="Source\Events\RepairTask.cs" />
+    <Compile Include="Source\GameSession\CrewManager.cs" />
+    <Compile Include="Source\Characters\AI\EnemyAIController.cs" />
+    <Compile Include="Source\Characters\FishAnimController.cs" />
+    <Compile Include="Source\GameSession\GameMode.cs" />
+    <Compile Include="Source\GameSession\HireManager.cs" />
+    <Compile Include="Source\Characters\HumanoidAnimController.cs" />
+    <Compile Include="Source\GameSession\SinglePlayerMode.cs" />
+    <Compile Include="Source\GameSession\TraitorMode.cs" />
+    <Compile Include="Source\GUI\ComponentStyle.cs" />
+    <Compile Include="Source\GUI\GUIImage.cs" />
+    <Compile Include="Source\GUI\GUIMessageBox.cs" />
+    <Compile Include="Source\GUI\GUITickBox.cs" />
+    <Compile Include="Source\IPropertyObject.cs" />
+    <Compile Include="Source\Items\CharacterInventory.cs" />
+    <Compile Include="Source\Items\Components\Machines\Fabricator.cs" />
+    <Compile Include="Source\Items\Components\Machines\MiniMap.cs" />
+    <Compile Include="Source\Items\Components\Machines\Engine.cs" />
+    <Compile Include="Source\Items\Components\Machines\Pump.cs" />
+    <Compile Include="Source\Items\Components\Machines\Radar.cs" />
+    <Compile Include="Source\Items\Components\Signal\OxygenDetector.cs" />
+    <Compile Include="Source\Items\Components\Signal\LightComponent.cs" />
+    <Compile Include="Source\Items\Components\Signal\NotComponent.cs" />
+    <Compile Include="Source\Items\Components\Signal\OrComponent.cs" />
+    <Compile Include="Source\Items\Components\Signal\AndComponent.cs" />
+    <Compile Include="Source\Items\Components\Signal\ConnectionPanel.cs" />
+    <Compile Include="Source\Items\Components\Signal\RegExFindComponent.cs" />
+    <Compile Include="Source\Items\Components\Machines\Steering.cs" />
+    <Compile Include="Source\Items\Components\Holdable\Throwable.cs" />
+    <Compile Include="Source\Items\Components\Turret.cs" />
+    <Compile Include="Source\Items\Components\Signal\Wire.cs" />
+    <Compile Include="Source\Items\Components\Signal\Connection.cs" />
+    <Compile Include="Source\Items\Inventory.cs" />
+    <Compile Include="Source\Items\ItemInventory.cs" />
+    <Compile Include="Source\Characters\Limb.cs" />
+    <Compile Include="Source\GameSession\GameSession.cs" />
+    <Compile Include="Source\Characters\Ragdoll.cs" />
+    <Compile Include="Source\Characters\StatusEffect.cs" />
+    <Compile Include="Source\DebugConsole.cs" />
+    <Compile Include="Source\Events\ScriptedTask.cs" />
+    <Compile Include="Source\Events\Task.cs" />
+    <Compile Include="Source\Events\TaskManager.cs" />
+    <Compile Include="Source\FrameCounter.cs" />
+    <Compile Include="Source\GUI\GUIStyle.cs" />
+    <Compile Include="Source\GUI\GUITextBox.cs" />
+    <Compile Include="Source\Items\Components\Container.cs" />
+    <Compile Include="Source\Items\Components\Machines\Controller.cs" />
+    <Compile Include="Source\Items\Components\Door.cs" />
+    <Compile Include="Source\Items\Components\Ladder.cs" />
+    <Compile Include="Source\Items\Components\Holdable\Pickable.cs" />
+    <Compile Include="Source\Items\Components\Power\PowerContainer.cs" />
+    <Compile Include="Source\Items\Components\Machines\OxygenGenerator.cs" />
+    <Compile Include="Source\Items\Components\Power\Powered.cs" />
+    <Compile Include="Source\Items\Components\Power\PowerTransfer.cs" />
+    <Compile Include="Source\Items\Components\Holdable\RangedWeapon.cs" />
+    <Compile Include="Source\Items\Components\Machines\Reactor.cs" />
+    <Compile Include="Source\Items\Components\Holdable\RepairTool.cs" />
+    <Compile Include="Source\Items\Components\Machines\Vent.cs" />
+    <Compile Include="Source\Items\RelatedItem.cs" />
+    <Compile Include="Source\Items\Components\Rope.cs" />
+    <Compile Include="Source\Items\Components\Wearable.cs" />
+    <Compile Include="Source\Map\Entity.cs" />
+    <Compile Include="Source\Map\Explosion.cs" />
+    <Compile Include="Source\Map\IDamageable.cs" />
+    <Compile Include="Source\Map\Levels\Level.cs" />
+    <Compile Include="Source\Map\Lights\ConvexHull.cs" />
+    <Compile Include="Source\Map\Lights\LightManager.cs" />
+    <Compile Include="Source\Map\Location.cs" />
+    <Compile Include="Source\Map\Map.cs" />
+    <Compile Include="Source\Map\Md5Hash.cs" />
+    <Compile Include="Source\Map\Levels\Voronoi.cs" />
+    <Compile Include="Source\Map\Levels\VoronoiElements.cs" />
+    <Compile Include="Source\Utils\MathUtils.cs" />
+    <Compile Include="Source\Physics\PhysicsBody.cs" />
+    <Compile Include="Source\Networking\NetworkEvent.cs" />
+    <Compile Include="Source\Networking\NetworkMember.cs" />
+    <Compile Include="Source\Particles\Particle.cs" />
+    <Compile Include="Source\Particles\ParticleManager.cs" />
+    <Compile Include="Source\Particles\ParticlePrefab.cs" />
+    <Compile Include="Source\Physics\Physics.cs" />
+    <Compile Include="Source\Properties.cs" />
+    <Compile Include="Source\Utils\SaveUtil.cs" />
+    <Compile Include="Source\Screens\EditCharacterScreen.cs" />
+    <Compile Include="Source\EventInput\EventInput.cs" />
+    <Compile Include="Source\EventInput\KeyboardDispatcher.cs" />
+    <Compile Include="Source\Screens\EditMapScreen.cs" />
+    <Compile Include="Source\Events\ScriptedEvent.cs" />
+    <Compile Include="Source\Events\MonsterEvent.cs" />
+    <Compile Include="Source\Screens\GameScreen.cs" />
+    <Compile Include="Source\GUI\GUIButton.cs" />
+    <Compile Include="Source\GUI\GUIComponent.cs" />
+    <Compile Include="Source\GUI\GUIFrame.cs" />
+    <Compile Include="Source\GUI\GUIListBox.cs" />
+    <Compile Include="Source\GUI\GUIProgressBar.cs" />
+    <Compile Include="Source\GUI\GUIScrollBar.cs" />
+    <Compile Include="Source\GUI\GUITextBlock.cs" />
+    <Compile Include="Source\Items\Components\Holdable\Holdable.cs" />
+    <Compile Include="Source\Items\Components\ItemComponent.cs" />
+    <Compile Include="Source\Items\ItemPrefab.cs" />
+    <Compile Include="Source\Items\Item.cs" />
+    <Compile Include="Source\Items\Components\Projectile.cs" />
+    <Compile Include="Source\Map\MapEntity.cs" />
+    <Compile Include="Source\Map\MapEntityPrefab.cs" />
+    <Compile Include="Source\Map\Submarine.cs" />
+    <Compile Include="Source\Map\Structure.cs" />
+    <Compile Include="Source\Map\StructurePrefab.cs" />
+    <Compile Include="Source\Map\WaterRenderer.cs" />
+    <Compile Include="Source\Map\WayPoint.cs" />
+    <Compile Include="Source\Networking\GameClient.cs" />
+    <Compile Include="Source\Networking\GameServer.cs" />
+    <Compile Include="Source\PlayerInput.cs" />
+    <Compile Include="Source\Map\Gap.cs" />
+    <Compile Include="Source\Game1.cs" />
+    <Compile Include="Source\GUI\GUI.cs" />
+    <Compile Include="Source\Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Screens\LobbyScreen.cs" />
-    <Compile Include="Screens\MainMenu.cs" />
-    <Compile Include="Screens\NetLobbyScreen.cs" />
-    <Compile Include="Screens\SettingsScreen.cs" />
-    <Compile Include="Screens\Screen.cs" />
-    <Compile Include="GameSettings.cs" />
-    <Compile Include="Sounds\OggSound.cs" />
-    <Compile Include="Sounds\SoundManager.cs" />
-    <Compile Include="Sounds\OggStream.cs" />
-    <Compile Include="Sounds\Sound.cs" />
-    <Compile Include="Sounds\AmbientSoundManager.cs" />
-    <Compile Include="Sprite.cs" />
-    <Compile Include="Utils\TextureLoader.cs" />
-    <Compile Include="Utils\ToolBox.cs" />
-    <Compile Include="Map\Hull.cs" />
+    <Compile Include="Source\Screens\LobbyScreen.cs" />
+    <Compile Include="Source\Screens\MainMenu.cs" />
+    <Compile Include="Source\Screens\NetLobbyScreen.cs" />
+    <Compile Include="Source\Screens\SettingsScreen.cs" />
+    <Compile Include="Source\Screens\Screen.cs" />
+    <Compile Include="Source\GameSettings.cs" />
+    <Compile Include="Source\Sounds\OggSound.cs" />
+    <Compile Include="Source\Sounds\SoundManager.cs" />
+    <Compile Include="Source\Sounds\OggStream.cs" />
+    <Compile Include="Source\Sounds\Sound.cs" />
+    <Compile Include="Source\Sounds\AmbientSoundManager.cs" />
+    <Compile Include="Source\Sprite.cs" />
+    <Compile Include="Source\Utils\TextureLoader.cs" />
+    <Compile Include="Source\Utils\ToolBox.cs" />
+    <Compile Include="Source\Map\Hull.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Lidgren.Network, Version=3.3.0.2069, Culture=neutral, processorArchitecture=MSIL">
@@ -677,6 +677,9 @@
     <Content Include="OpenAL32.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="README.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
@@ -866,6 +869,9 @@
     <None Include="Content\Sounds\Damage\StructureCrunch3.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Content\Sounds\startDrone.ogg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\SpriteFont1.xnb">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/Subsurface/readme.txt b/Subsurface/readme.txt
new file mode 100644
index 000000000..716523cd8
--- /dev/null
+++ b/Subsurface/readme.txt
@@ -0,0 +1,45 @@
+SUBSURFACE
+
+www.undertowgames.com/subsurface
+Copyright © Undertow Games 2015
+
+Controls:
+WASD		-	move
+Shift		-	run
+E			-	use/activate items and devices
+Right click	-	aim with equipped item
+Left click	-	use equipped item
+Tab			-	select/deselect the chat box in multiplayer mode
+F3			-	open/close console
+
+See the wiki for more detailed info and instructions:
+http://subsurface.wikia.com/wiki/Subsurface_Wiki
+
+------------------------------------------------------------------------
+
+Programming, graphics, sounds, game design - Joonas Rikkonen ("Regalis")
+Graphics - James Bear ("Moonsaber99")
+
+------------------------------------------------------------------------
+
+"Enter the Maze", "Simplex", "Unseen Horrors"
+Kevin MacLeod (incompetech.com)
+Licensed under Creative Commons: By Attribution 3.0
+http://creativecommons.org/licenses/by/3.0/
+
+------------------------------------------------------------------------
+
+Lidgren.Network networking library - Michael Lidgren
+
+------------------------------------------------------------------------
+
+Sound effects:
+	metal whining and screeching - ScottFerguson1
+	metal gate 10 - thencamenow
+	foil_expanding_multiple - markb
+	Bug Zapper_Many medium zaps - CGEffex
+	
+------------------------------------------------------------------------
+
+Textures from the PK01, PK02 and Ancient Collection Texture packages by Philip Klevestav are used in some of the sprites in the game. 
+The texture packages are licensed under a Creative Commons Attribution 3.0 Unported License (https://creativecommons.org/licenses/by/3.0/).
\ No newline at end of file
diff --git a/Subsurface_Solution.v12.suo b/Subsurface_Solution.v12.suo
index d1ca1d9c2..51bbc9abe 100644
Binary files a/Subsurface_Solution.v12.suo and b/Subsurface_Solution.v12.suo differ