diff --git a/DepthsBelow/DepthsBelow/Component/Shooting.cs b/DepthsBelow/DepthsBelow/Component/Stat.cs
similarity index 70%
rename from DepthsBelow/DepthsBelow/Component/Shooting.cs
rename to DepthsBelow/DepthsBelow/Component/Stat.cs
index 382d5ac..2a00b2a 100644
--- a/DepthsBelow/DepthsBelow/Component/Shooting.cs
+++ b/DepthsBelow/DepthsBelow/Component/Stat.cs
@@ -5,7 +5,7 @@ using System.Text;
 
 namespace DepthsBelow.Component
 {
-    class Shooting : Component
+    public class Stat : Component
     {
         protected int stepsTaken = 0;
         protected int distanceToTarget = 0;
@@ -16,7 +16,22 @@ namespace DepthsBelow.Component
 
         protected int penaltyRange = 5;
 
-        public Shooting(Entity parent) : base (parent)
+        public int GetAim()
+        {
+            return (soldierAim + weaponAccuracy);
+        }
+
+        public int GetDodge()
+        {
+            return enemyDodge;
+        }
+
+        public int Penalty(int distance)
+        {
+            return panic + GetPenalty(stepsTaken) + (int)(GetPenalty(distance) / 2);
+        }
+
+        public Stat(Entity parent) : base (parent)
         {
 
         }
@@ -26,16 +41,7 @@ namespace DepthsBelow.Component
             return false;
         }
 
-        public int CalculateChance()
-        {
-            int baseHitChance = soldierAim + weaponAccuracy;
-            int baseDodgeChance = panic + enemyDodge;
-            int basePenalty = ReturnPenalty(stepsTaken) + (int)(ReturnPenalty(distanceToTarget) / 2);
-            int chanceToHit = baseHitChance - baseDodgeChance - basePenalty;
-            return chanceToHit;
-        }
-
-        public int ReturnPenalty(int distance)
+        public int GetPenalty(int distance)
         {
             int penalty = 0;
             if (distance >= penaltyRange * 3)
diff --git a/DepthsBelow/DepthsBelow/Core.cs b/DepthsBelow/DepthsBelow/Core.cs
index cbe8091..7cea473 100755
--- a/DepthsBelow/DepthsBelow/Core.cs
+++ b/DepthsBelow/DepthsBelow/Core.cs
@@ -1,213 +1,201 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using DepthsBelow.GUI;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Audio;
-using Microsoft.Xna.Framework.Content;
-using Microsoft.Xna.Framework.GamerServices;
-using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Input;
-using Microsoft.Xna.Framework.Media;
-
-namespace DepthsBelow
-{
-	/// <summary>
-	/// This is the main type for your game
-	/// </summary>
-	public class Core : Microsoft.Xna.Framework.Game
-	{
-		public static GraphicsDeviceManager GraphicsDeviceManager;
-		SpriteBatch spriteBatch;
-
-		public Lua Lua;
-
-		public Camera Camera;
-
-        public bool PlayerTurn = true;
-		public static MouseInput MouseInput;
-        public static KeyboardInput KeyboardInput;
-		public List<Soldier> Squad;
-        public List<SmallEnemy> Swarm;
-        public List<Shot> Volley;
-		public static Map Map;
-
-		public SmallEnemy TestMonster;
-
-		public Core()
-		{
-			GraphicsDeviceManager = new GraphicsDeviceManager(this);
-			Content.RootDirectory = "Content";
-
-			GraphicsDeviceManager.PreferredBackBufferWidth = 1280;
-			GraphicsDeviceManager.PreferredBackBufferHeight = 720;
-			GraphicsDeviceManager.IsFullScreen = false;
-
-			//graphics.SynchronizeWithVerticalRetrace = false;
-			this.IsFixedTimeStep = false;
-			GraphicsDeviceManager.ApplyChanges();
-
-			this.IsMouseVisible = true;
-
-			GameServices.AddService<GraphicsDevice>(GraphicsDevice);
-			GameServices.AddService<ContentManager>(Content);
-		}
-
-		/// <summary>
-		/// Allows the game to perform any initialization it needs to before starting to run.
-		/// This is where it can query for any required services and load any non-graphic
-		/// related content.  Calling base.Initialize will enumerate through any components
-		/// and initialize them as well.
-		/// </summary>
-		protected override void Initialize()
-		{
-			// TODO: Add your initialization logic here
-			Camera = new Camera(this);
-			Squad = new List<Soldier>();
-            Swarm = new List<SmallEnemy>();
-            Volley = new List<Shot>();
-
-			TestMonster = new SmallEnemy(this, ref Swarm);
-
-			// Run scripts after everything is initialized
-			Lua = new Lua();
-			Lua.LoadScripts();
-
-			base.Initialize();
-		}
-
-		/// <summary>
-		/// LoadContent will be called once per game and is the place to load
-		/// all of your content.
-		/// </summary>
-		protected override void LoadContent()
-		{
-			// Create a new SpriteBatch, which can be used to draw textures.
-			spriteBatch = new SpriteBatch(GraphicsDevice);
-
-			Map = Content.Load<Map>("maps/Cave.Level1");
-			// Load map objects
-			Map.ParseObjects(this);
-
-			// TODO: use this.Content to load your game content here
-			Soldier.LoadContent(this);
-            SmallEnemy.LoadContent(this);
-            Shot.LoadContent(this);
-            
-			MouseInput = new MouseInput(this);
-			MouseInput.LoadContent();
-            KeyboardInput = new KeyboardInput(this);
-
-            TestMonster.X = 12;
-            TestMonster.Y = 4;
-			
-			//frame.Add(text);
-		}
-
-		/// <summary>
-		/// UnloadContent will be called once per game and is the place to unload
-		/// all content.
-		/// </summary>
-		protected override void UnloadContent()
-		{
-			// TODO: Unload any non ContentManager content here
-		}
-
-		/// <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>
-		protected override void Update(GameTime gameTime)
-		{
-			// Allows the game to exit
-			if (GamePad.GetState(PlayerIndex.One).Buttons.Back == ButtonState.Pressed)
-				this.Exit();
-
-			Camera.Update(gameTime);
-			MouseInput.Update(gameTime);
-            KeyboardInput.Update(gameTime);
-
-			// Update soldiers in squad
-			foreach (var soldier in Squad)
-				soldier.Update(gameTime);
-
-            foreach (var body in Swarm)
-                body.Update(gameTime);
-
-            foreach (var bullet in Volley)
-                bullet.Update(gameTime);
-
-            TestMonster.Update(gameTime);
-			GUIManager.Update(gameTime);
-
-			base.Update(gameTime);
-		}
-
-        public int FindDistance(Vector2 target, Vector2 start)
-        {
-            Vector2 combine = new Vector2(target.X - start.X, target.Y - start.Y);
-            
-            int result = 0;
-            int firstRestult = (int)Math.Sqrt((int)combine.X^2 + (int)combine.Y^2);
-
-            result = (int)Vector2.Distance(target, start);
-
-            return result;
-        }
-
-		/// <summary>
-		/// This is called when the game should draw itself.
-		/// </summary>
-		/// <param name="gameTime">Provides a snapshot of timing values.</param>
-		protected override void Draw(GameTime gameTime)
-		{
-			GraphicsDevice.Clear(Color.Black);
-
-			// Start drawing using the Camera transform
-			spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null, null,
-			                  Camera.Transform);
-
-			// Draw the level
-			Map.Draw(spriteBatch);
-
-			// Draw units
-			foreach (var soldier in Squad)
-			{
-				var sr = soldier.GetComponent<Component.SpriteRenderer>();
-				if (sr != null)
-					sr.Draw(spriteBatch);
-			}
-            foreach (var body in Swarm)
-            {
-                var sr = body.GetComponent<Component.SpriteRenderer>();
-                if (sr != null)
-                    sr.Draw(spriteBatch);
-            }
-            foreach (var bullet in Volley)
-            {
-                var sr = bullet.GetComponent<Component.SpriteRenderer>();
-                if (sr != null)
-                    sr.Draw(spriteBatch);
-            }
-
-			// Draw mouse input visuals
-			MouseInput.Draw(spriteBatch);
-
-			TestMonster.GetComponent<Component.SpriteRenderer>().Draw(spriteBatch);
-
-			spriteBatch.End();
-
-			// Start drawing GUI components
-			spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.AnisotropicClamp, null, null, null, Matrix.Identity);
-			GUIManager.Draw(spriteBatch);
-			spriteBatch.End();
-
-			base.Draw(gameTime);
-		}
-
-
-	}
-}
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using DepthsBelow.GUI;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Audio;
+using Microsoft.Xna.Framework.Content;
+using Microsoft.Xna.Framework.GamerServices;
+using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Input;
+using Microsoft.Xna.Framework.Media;
+
+namespace DepthsBelow
+{
+	/// <summary>
+	/// This is the main type for your game
+	/// </summary>
+	public class Core : Microsoft.Xna.Framework.Game
+	{
+		public static GraphicsDeviceManager GraphicsDeviceManager;
+		SpriteBatch spriteBatch;
+
+		public Lua Lua;
+
+		public Camera Camera;
+
+        public bool PlayerTurn = true;
+		public static MouseInput MouseInput;
+        public static KeyboardInput KeyboardInput;
+		public List<Soldier> Squad;
+        public List<SmallEnemy> Swarm;
+        public List<Shot> Volley;
+		public static Map Map;
+
+		public SmallEnemy TestMonster;
+
+		public Core()
+		{
+			GraphicsDeviceManager = new GraphicsDeviceManager(this);
+			Content.RootDirectory = "Content";
+
+			GraphicsDeviceManager.PreferredBackBufferWidth = 1280;
+			GraphicsDeviceManager.PreferredBackBufferHeight = 720;
+			GraphicsDeviceManager.IsFullScreen = false;
+
+			//graphics.SynchronizeWithVerticalRetrace = false;
+			this.IsFixedTimeStep = false;
+			GraphicsDeviceManager.ApplyChanges();
+
+			this.IsMouseVisible = true;
+
+			GameServices.AddService<GraphicsDevice>(GraphicsDevice);
+			GameServices.AddService<ContentManager>(Content);
+		}
+
+		/// <summary>
+		/// Allows the game to perform any initialization it needs to before starting to run.
+		/// This is where it can query for any required services and load any non-graphic
+		/// related content.  Calling base.Initialize will enumerate through any components
+		/// and initialize them as well.
+		/// </summary>
+		protected override void Initialize()
+		{
+			// TODO: Add your initialization logic here
+			Camera = new Camera(this);
+			Squad = new List<Soldier>();
+            Swarm = new List<SmallEnemy>();
+            Volley = new List<Shot>();
+
+			TestMonster = new SmallEnemy(this, ref Swarm);
+
+			// Run scripts after everything is initialized
+			Lua = new Lua();
+			Lua.LoadScripts();
+
+			base.Initialize();
+		}
+
+		/// <summary>
+		/// LoadContent will be called once per game and is the place to load
+		/// all of your content.
+		/// </summary>
+		protected override void LoadContent()
+		{
+			// Create a new SpriteBatch, which can be used to draw textures.
+			spriteBatch = new SpriteBatch(GraphicsDevice);
+
+			Map = Content.Load<Map>("maps/Cave.Level1");
+			// Load map objects
+			Map.ParseObjects(this);
+
+			// TODO: use this.Content to load your game content here
+			Soldier.LoadContent(this);
+            SmallEnemy.LoadContent(this);
+            Shot.LoadContent(this);
+            
+			MouseInput = new MouseInput(this);
+			MouseInput.LoadContent();
+            KeyboardInput = new KeyboardInput(this);
+
+            TestMonster.X = 12;
+            TestMonster.Y = 4;
+
+			//frame.Add(text);
+		}
+
+		/// <summary>
+		/// UnloadContent will be called once per game and is the place to unload
+		/// all content.
+		/// </summary>
+		protected override void UnloadContent()
+		{
+			// TODO: Unload any non ContentManager content here
+		}
+
+		/// <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>
+		protected override void Update(GameTime gameTime)
+		{
+			// Allows the game to exit
+			if (GamePad.GetState(PlayerIndex.One).Buttons.Back == ButtonState.Pressed)
+				this.Exit();
+
+			Camera.Update(gameTime);
+			MouseInput.Update(gameTime);
+            KeyboardInput.Update(gameTime);
+
+			// Update soldiers in squad
+			foreach (var soldier in Squad)
+				soldier.Update(gameTime);
+
+            foreach (var body in Swarm)
+                body.Update(gameTime);
+
+            foreach (var bullet in Volley)
+                bullet.Update(gameTime);
+
+            TestMonster.Update(gameTime);
+			GUIManager.Update(gameTime);
+            
+			base.Update(gameTime);
+		}
+
+		/// <summary>
+		/// This is called when the game should draw itself.
+		/// </summary>
+		/// <param name="gameTime">Provides a snapshot of timing values.</param>
+		protected override void Draw(GameTime gameTime)
+		{
+			GraphicsDevice.Clear(Color.Black);
+
+			// Start drawing using the Camera transform
+			spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null, null,
+			                  Camera.Transform);
+
+			// Draw the level
+			Map.Draw(spriteBatch);
+
+			// Draw units
+			foreach (var soldier in Squad)
+			{
+				var sr = soldier.GetComponent<Component.SpriteRenderer>();
+				if (sr != null)
+					sr.Draw(spriteBatch);
+			}
+            foreach (var body in Swarm)
+            {
+                var sr = body.GetComponent<Component.SpriteRenderer>();
+                if (sr != null)
+                    sr.Draw(spriteBatch);
+            }
+            foreach (var bullet in Volley)
+            {
+                var sr = bullet.GetComponent<Component.SpriteRenderer>();
+                if (sr != null)
+                    sr.Draw(spriteBatch);
+            }
+
+			// Draw mouse input visuals
+			MouseInput.Draw(spriteBatch);
+
+			TestMonster.GetComponent<Component.SpriteRenderer>().Draw(spriteBatch);
+
+			spriteBatch.End();
+
+			// Start drawing GUI components
+			spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.AnisotropicClamp, null, null, null, Matrix.Identity);
+			GUIManager.Draw(spriteBatch);
+			spriteBatch.End();
+
+			base.Draw(gameTime);
+		}
+
+
+	}
+}
diff --git a/DepthsBelow/DepthsBelow/DepthsBelow.csproj b/DepthsBelow/DepthsBelow/DepthsBelow.csproj
index a11ea38..8a968e4 100644
--- a/DepthsBelow/DepthsBelow/DepthsBelow.csproj
+++ b/DepthsBelow/DepthsBelow/DepthsBelow.csproj
@@ -1,203 +1,204 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{94683C5B-052D-4143-96D8-35C67E831000}</ProjectGuid>
-    <ProjectTypeGuids>{6D335F3A-9D43-41b4-9D22-F6F17C4BE596};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DepthsBelow</RootNamespace>
-    <AssemblyName>DepthsBelow</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-	<TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <XnaFrameworkVersion>v4.0</XnaFrameworkVersion>
-    <XnaPlatform>Windows</XnaPlatform>
-    <XnaProfile>HiDef</XnaProfile>
-    <XnaCrossPlatformGroupID>faa0577e-a03e-43cf-89c7-0a03f4c22717</XnaCrossPlatformGroupID>
-    <XnaOutputType>Game</XnaOutputType>
-    <ApplicationIcon>Game.ico</ApplicationIcon>
-    <Thumbnail>GameThumbnail.png</Thumbnail>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <PublishWizardCompleted>true</PublishWizardCompleted>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\x86\Debug</OutputPath>
-    <DefineConstants>DEBUG;TRACE;WINDOWS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoStdLib>true</NoStdLib>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <PlatformTarget>x86</PlatformTarget>
-    <XnaCompressContent>false</XnaCompressContent>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\x86\Release</OutputPath>
-    <DefineConstants>TRACE;WINDOWS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoStdLib>true</NoStdLib>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <PlatformTarget>x86</PlatformTarget>
-    <XnaCompressContent>true</XnaCompressContent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ManifestCertificateThumbprint>ECE66DEF071576E8D2F7D57232C0569623E3E2DF</ManifestCertificateThumbprint>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ManifestKeyFile>DepthsBelow_TemporaryKey.pfx</ManifestKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignManifests>true</SignManifests>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="LuaInterface, Version=2.0.0.16708, Culture=neutral, processorArchitecture=x86">
-      <HintPath>..\..\LuaInterface\LuaInterface.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Xna.Framework.GamerServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Xna.Framework.Video, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Xna.Framework.Avatar, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Xna.Framework.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Xna.Framework.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="mscorlib">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Core">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Net">
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Camera.cs" />
-    <Compile Include="CustomExtensions.cs" />
-    <Compile Include="GameServices.cs" />
-    <Compile Include="Interface.cs" />
-    <Compile Include="Lua.cs" />
-    <Compile Include="Shot.cs" />
-    <Compile Include="Component\Shooting.cs" />
-    <Compile Include="GUIManager.cs" />
-    <Compile Include="GUI\Button.cs" />
-    <Compile Include="GUI\Frame.cs" />
-    <Compile Include="GUI\Text.cs" />
-    <Compile Include="KeyboardInput.cs" />
-    <Compile Include="Component\PathFinder.cs" />
-    <Compile Include="Component\Transform.cs" />
-    <Compile Include="Grid.cs" />
-    <Compile Include="Component\Collision.cs" />
-    <Compile Include="Component\Component.cs" />
-    <Compile Include="Component\GridTransform.cs" />
-    <Compile Include="Core.cs" />
-    <Compile Include="Entity.cs" />
-    <Compile Include="Map.cs" />
-    <Compile Include="MouseInput.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Component\SpriteRenderer.cs" />
-    <Compile Include="RenderHelpers.cs" />
-    <Compile Include="SmallEnemy.cs" />
-    <Compile Include="Soldier.cs" />
-    <Compile Include="Component\PixelTransform.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Game.ico" />
-    <Content Include="GameThumbnail.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\AStar\AStar.csproj">
-      <Project>{CD3F949D-54AA-4D38-99DB-92905A375D84}</Project>
-      <Name>AStar</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\DepthsBelowContent\DepthsBelowContent.contentproj">
-      <Name>DepthsBelowContent %28Content%29</Name>
-      <XnaReferenceType>Content</XnaReferenceType>
-      <Project>{433A77A2-DE52-4875-A4EF-232CF59C2DD3}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Xna.Framework.4.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft XNA Framework Redistributable 4.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="DepthsBelow_TemporaryKey.pfx" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\Microsoft.Xna.GameStudio.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{94683C5B-052D-4143-96D8-35C67E831000}</ProjectGuid>
+    <ProjectTypeGuids>{6D335F3A-9D43-41b4-9D22-F6F17C4BE596};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DepthsBelow</RootNamespace>
+    <AssemblyName>DepthsBelow</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <XnaFrameworkVersion>v4.0</XnaFrameworkVersion>
+    <XnaPlatform>Windows</XnaPlatform>
+    <XnaProfile>HiDef</XnaProfile>
+    <XnaCrossPlatformGroupID>faa0577e-a03e-43cf-89c7-0a03f4c22717</XnaCrossPlatformGroupID>
+    <XnaOutputType>Game</XnaOutputType>
+    <ApplicationIcon>Game.ico</ApplicationIcon>
+    <Thumbnail>GameThumbnail.png</Thumbnail>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\x86\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;WINDOWS</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoStdLib>true</NoStdLib>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaCompressContent>false</XnaCompressContent>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\x86\Release</OutputPath>
+    <DefineConstants>TRACE;WINDOWS</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoStdLib>true</NoStdLib>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaCompressContent>true</XnaCompressContent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>ECE66DEF071576E8D2F7D57232C0569623E3E2DF</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>DepthsBelow_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="LuaInterface, Version=2.0.0.16708, Culture=neutral, processorArchitecture=x86">
+      <HintPath>..\..\LuaInterface\LuaInterface.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework.GamerServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework.Video, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework.Avatar, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="mscorlib">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Core">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Net">
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Camera.cs" />
+    <Compile Include="CustomExtensions.cs" />
+    <Compile Include="GameServices.cs" />
+    <Compile Include="Interface.cs" />
+    <Compile Include="Lua.cs" />
+    <Compile Include="Shot.cs" />
+    <Compile Include="Component\Stat.cs" />
+    <Compile Include="GUIManager.cs" />
+    <Compile Include="GUI\Button.cs" />
+    <Compile Include="GUI\Frame.cs" />
+    <Compile Include="GUI\Text.cs" />
+    <Compile Include="KeyboardInput.cs" />
+    <Compile Include="Component\PathFinder.cs" />
+    <Compile Include="Component\Transform.cs" />
+    <Compile Include="Grid.cs" />
+    <Compile Include="Component\Collision.cs" />
+    <Compile Include="Component\Component.cs" />
+    <Compile Include="Component\GridTransform.cs" />
+    <Compile Include="Core.cs" />
+    <Compile Include="Entity.cs" />
+    <Compile Include="Map.cs" />
+    <Compile Include="MouseInput.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Component\SpriteRenderer.cs" />
+    <Compile Include="RenderHelpers.cs" />
+    <Compile Include="SmallEnemy.cs" />
+    <Compile Include="Soldier.cs" />
+    <Compile Include="Component\PixelTransform.cs" />
+    <Compile Include="Utility.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Game.ico" />
+    <Content Include="GameThumbnail.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\AStar\AStar.csproj">
+      <Project>{CD3F949D-54AA-4D38-99DB-92905A375D84}</Project>
+      <Name>AStar</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\DepthsBelowContent\DepthsBelowContent.contentproj">
+      <Name>DepthsBelowContent %28Content%29</Name>
+      <XnaReferenceType>Content</XnaReferenceType>
+      <Project>{433A77A2-DE52-4875-A4EF-232CF59C2DD3}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Xna.Framework.4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft XNA Framework Redistributable 4.0</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="DepthsBelow_TemporaryKey.pfx" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\Microsoft.Xna.GameStudio.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.
@@ -205,5 +206,5 @@
       </Target>
       <Target Name="AfterBuild">
       </Target>
-    -->
+    -->
 </Project>
\ No newline at end of file
diff --git a/DepthsBelow/DepthsBelow/Entity.cs b/DepthsBelow/DepthsBelow/Entity.cs
index 838dc97..572d108 100644
--- a/DepthsBelow/DepthsBelow/Entity.cs
+++ b/DepthsBelow/DepthsBelow/Entity.cs
@@ -1,70 +1,73 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.Xna.Framework;
-
-namespace DepthsBelow
-{
-	public class Entity
-	{
-		List<Component.Component> Components;
-		public Component.Transform Transform;
-		public Component.PixelTransform pixelTransform;
-		public Component.GridTransform gridTransform;
-		public int X
-		{
-			get { return this.Transform.Grid.X; }
-			set 
-			{
-				this.Transform.Grid.X = value;
-			}
-		}
-		public int Y
-		{
-			get { return this.Transform.Grid.Y; }
-			set
-			{
-				this.Transform.Grid.Y = value;
-			}
-		}
-
-		protected Core core;
-
-		public Entity(Core core)
-		{
-			this.core = core;
-
-			Components = new List<Component.Component>();
-			Transform = new Component.Transform(this);
-			AddComponent(Transform);
-			pixelTransform = new Component.PixelTransform(this);
-			AddComponent(pixelTransform);
-			gridTransform = new Component.GridTransform(this);
-			AddComponent(gridTransform);
-		}
-
-		public T GetComponent<T>() where T : Component.Component
-		{
-			foreach (Component.Component c in Components)
-			{
-				if (c is T)
-					return (T)c;
-			}
-
-			return null;
-		}
-
-		public void AddComponent(Component.Component c)
-		{
-			Components.Add(c);
-		}
-
-		public virtual void Update(GameTime gameTime)
-		{
-			// Update components
-			foreach (Component.Component c in Components)
-				c.Update(gameTime);
-		}
-	}
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Xna.Framework;
+
+namespace DepthsBelow
+{
+	public class Entity
+	{
+		List<Component.Component> Components;
+		public Component.Transform Transform;
+		public Component.PixelTransform pixelTransform;
+		public Component.GridTransform gridTransform;
+        public Component.Stat stat;
+		public int X
+		{
+			get { return this.Transform.Grid.X; }
+			set 
+			{
+				this.Transform.Grid.X = value;
+			}
+		}
+		public int Y
+		{
+			get { return this.Transform.Grid.Y; }
+			set
+			{
+				this.Transform.Grid.Y = value;
+			}
+		}
+
+		protected Core core;
+
+		public Entity(Core core)
+		{
+			this.core = core;
+
+			Components = new List<Component.Component>();
+			Transform = new Component.Transform(this);
+			AddComponent(Transform);
+			pixelTransform = new Component.PixelTransform(this);
+			AddComponent(pixelTransform);
+			gridTransform = new Component.GridTransform(this);
+			AddComponent(gridTransform);
+            stat = new Component.Stat(this);
+            AddComponent(stat);
+		}
+
+		public T GetComponent<T>() where T : Component.Component
+		{
+			foreach (Component.Component c in Components)
+			{
+				if (c is T)
+					return (T)c;
+			}
+
+			return null;
+		}
+
+		public void AddComponent(Component.Component c)
+		{
+			Components.Add(c);
+		}
+
+		public virtual void Update(GameTime gameTime)
+		{
+			// Update components
+			foreach (Component.Component c in Components)
+				c.Update(gameTime);
+		}
+	}
+}
diff --git a/DepthsBelow/DepthsBelow/KeyboardInput.cs b/DepthsBelow/DepthsBelow/KeyboardInput.cs
index c9dd67e..b0b2f59 100644
--- a/DepthsBelow/DepthsBelow/KeyboardInput.cs
+++ b/DepthsBelow/DepthsBelow/KeyboardInput.cs
@@ -15,7 +15,7 @@ namespace DepthsBelow
         Core core;
         bool Enter = false;
         bool turn;
-        int checkerSpeed = 1;
+        int checkerSpeed = 2;
 
         public KeyboardInput(Core core)
         {
@@ -48,13 +48,14 @@ namespace DepthsBelow
                     core.TestMonster.step = 0;
                     core.PlayerTurn = false;
                     Point target = Point.Zero;
-                    int distance = 7000;
+                    float distance = 7000;
                     foreach (var unit in core.Squad)
                     {
                         Vector2 soldier = new Vector2(unit.Transform.Grid.X, unit.Transform.Grid.Y);
                         Vector2 monster = new Vector2(core.TestMonster.Transform.Grid.X, core.TestMonster.Transform.Grid.Y);
 
-                        int newDistance = core.FindDistance(soldier, monster);
+                        float newDistance = Vector2.Distance(soldier, monster);
+
                         if (newDistance < distance)
                         {
                             target = unit.Transform.Grid;
diff --git a/DepthsBelow/DepthsBelow/Utility.cs b/DepthsBelow/DepthsBelow/Utility.cs
new file mode 100644
index 0000000..0f0e713
--- /dev/null
+++ b/DepthsBelow/DepthsBelow/Utility.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Xna.Framework;
+
+namespace DepthsBelow
+{
+    static class Utility
+    {
+        public static int CalculateHitChance(Entity attacker, Entity defender)
+        {
+            Component.Stat shooting = attacker.GetComponent<Component.Stat>();
+            Component.Stat dodging = defender.GetComponent<Component.Stat>();
+            if (shooting == null || dodging == null) 
+            {
+                return 0;
+            }
+            int baseHitChance = shooting.GetAim();
+            int baseDodgeChance = dodging.GetDodge();
+            int basePenalty = shooting.Penalty((int)Vector2.Distance(attacker.GetComponent<Component.Transform>().World.Position, defender.GetComponent<Component.Transform>().World.Position) / Grid.TileSize);
+            int chanceToHit = baseHitChance - baseDodgeChance - basePenalty;
+            return chanceToHit;
+        }
+    }
+}