diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios.suo
Binary file axios.suo has changed
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Axios_settings.cs
--- a/axios/Axios_settings.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Axios_settings.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -51,23 +51,18 @@
  * 1.0.1.1 - 3/22/2012
  * - Fixing UI collision with mouse pointer
  * - Adding AxiosRectangle and AxiosPoint classes
+ * - Adding properties in DrawableAxiosGameObject to turn on/off the following:
+ *   - AdjustUnits
+ *   - RelativeToCamera
+ * - Cleaning and sorting using statements
+ *
  * 
  * 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Reflection;
+using Axios.Engine.Log;
 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;
-using System.Reflection;
-using Axios.Engine.Extenions;
-using Axios.Engine.Log;
 
 namespace Axios
 {
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/AxiosBreakableGameObject.cs
--- a/axios/Engine/AxiosBreakableGameObject.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/AxiosBreakableGameObject.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using FarseerPhysics.Dynamics;
+using System.Collections.Generic;
 
 using Axios.Engine.Interfaces;
 
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/AxiosEvents.cs
--- a/axios/Engine/AxiosEvents.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/AxiosEvents.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using FarseerPhysics.SamplesFramework;
 
 namespace Axios.Engine
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/AxiosGameObject.cs
--- a/axios/Engine/AxiosGameObject.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/AxiosGameObject.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Axios.Engine.Interfaces;
+using Axios.Engine.Interfaces;
+using FarseerPhysics.Dynamics;
 using FarseerPhysics.SamplesFramework;
 using Microsoft.Xna.Framework;
-using FarseerPhysics.Dynamics;
 
 namespace Axios.Engine
 {
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/AxiosGameScreen.cs
--- a/axios/Engine/AxiosGameScreen.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/AxiosGameScreen.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,26 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
+using Axios.Engine.Interfaces;
+using Axios.Engine.Log;
+using Axios.Engine.Structures;
+using Axios.Engine.UI;
+using FarseerPhysics.Dynamics;
+using FarseerPhysics.SamplesFramework;
 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;
-using FarseerPhysics.Dynamics;
-using FarseerPhysics.Dynamics.Joints;
-using FarseerPhysics.Dynamics.Contacts;
-using FarseerPhysics.Factories;
-using FarseerPhysics.Common;
-using FarseerPhysics.SamplesFramework;
-using Axios.Engine.Interfaces;
-using Axios.Engine.UI;
-using Axios.Engine.Log;
-using Axios.Engine.File;
-using System.IO;
-using Axios.Engine.Structures;
 
 namespace Axios.Engine
 {
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/AxiosTimer.cs
--- a/axios/Engine/AxiosTimer.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/AxiosTimer.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 using Axios.Engine.Interfaces;
 using Microsoft.Xna.Framework;
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/Data/AxiosCSV.cs
--- a/axios/Engine/Data/AxiosCSV.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/Data/AxiosCSV.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
+
 using Axios.Engine.File;
 
 namespace Axios.Engine.Data
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/DrawableAxiosGameObject.cs
--- a/axios/Engine/DrawableAxiosGameObject.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/DrawableAxiosGameObject.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,13 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
+using Axios.Engine.Interfaces;
+using FarseerPhysics.SamplesFramework;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using FarseerPhysics.Dynamics;
-using FarseerPhysics.SamplesFramework;
-using Axios.Engine.Interfaces;
 
 namespace Axios.Engine
 {
@@ -15,12 +10,23 @@
     {
         protected int _draworder;
         protected Texture2D Texture;
-        //protected float _scale = 1f;
-        public Vector2 Position = new Vector2();
+        public Vector2 Position = new Vector2(); //set this to a property and adjust if adjustunits is true
         public Vector2 Origin = new Vector2();
 
-        protected Boolean _adjustunits = true;
-        protected Boolean _relativetocamera = true;
+        protected bool _adjustunits = true;
+        protected bool _relativetocamera = true;
+
+        public bool AdjustUnits //if value changed - change position depending on adjusting the units
+        {
+            get { return _adjustunits; }
+            set { _adjustunits = value; }
+        }
+
+        public bool RelativeToCamera
+        {
+            get { return _relativetocamera; }
+            set { _relativetocamera = value; }
+        }
 
         public override void LoadContent(AxiosGameScreen gameScreen)
         {
@@ -29,17 +35,9 @@
             
         }
 
-        /*public float Scale
-        {
-            get { return _scale; }
-            set { _scale = value; }
-        }*/
-
         public virtual void Draw(AxiosGameScreen gameScreen, GameTime gameTime)
         {
-/*#if DEBUG
-            System.Diagnostics.Debugger.Break();
-#endif*/
+
             if (_relativetocamera)
                 gameScreen.ScreenManager.SpriteBatch.Begin(0, null, null, null, null, null, gameScreen.Camera.View);
             else
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/Extensions/String.cs
--- a/axios/Engine/Extensions/String.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/Extensions/String.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
+
 namespace Axios.Engine.Extenions
 {
     public static class AxiosExtensions_String
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/Extensions/Texture2D.cs
--- a/axios/Engine/Extensions/Texture2D.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/Extensions/Texture2D.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
+
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework;
 
 
 namespace Axios.Engine.Extenions
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/File/AxiosFile.cs
--- a/axios/Engine/File/AxiosFile.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/File/AxiosFile.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
 
 using Axios.Engine.Interfaces;
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/File/AxiosIsolatedFile.cs
--- a/axios/Engine/File/AxiosIsolatedFile.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/File/AxiosIsolatedFile.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.IO;
 using System.IO.IsolatedStorage;
-using System.IO;
-
 using Axios.Engine.Interfaces;
 
 namespace Axios.Engine.File
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/File/AxiosRegularFile.cs
--- a/axios/Engine/File/AxiosRegularFile.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/File/AxiosRegularFile.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.IO;
+using System.IO;
 
 using Axios.Engine.Interfaces;
 
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/File/AxiosTitleFile.cs
--- a/axios/Engine/File/AxiosTitleFile.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/File/AxiosTitleFile.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
+using Axios.Engine.Interfaces;
 using Microsoft.Xna.Framework;
-using Axios.Engine.File;
-using Axios.Engine.Interfaces;
 
 namespace Axios.Engine.File
 {
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/Interfaces/IAxiosFile.cs
--- a/axios/Engine/Interfaces/IAxiosFile.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/Interfaces/IAxiosFile.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.IO;
+using System.IO;
 
 namespace Axios.Engine.Interfaces
 {
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/Interfaces/IAxiosGameObject.cs
--- a/axios/Engine/Interfaces/IAxiosGameObject.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/Interfaces/IAxiosGameObject.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using FarseerPhysics.SamplesFramework;
 using Microsoft.Xna.Framework;
-using FarseerPhysics.SamplesFramework;
 
 
 namespace Axios.Engine.Interfaces
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/Interfaces/IDrawableAxiosGameObject.cs
--- a/axios/Engine/Interfaces/IDrawableAxiosGameObject.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/Interfaces/IDrawableAxiosGameObject.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 
 namespace Axios.Engine.Interfaces
 {
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/Log/AxiosLog.cs
--- a/axios/Engine/Log/AxiosLog.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/Log/AxiosLog.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
-using Axios.Engine;
 
 namespace Axios.Engine.Log
 {
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/SimpleAxiosGameObject.cs
--- a/axios/Engine/SimpleAxiosGameObject.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/SimpleAxiosGameObject.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,12 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using Axios.Engine.Log;
 using FarseerPhysics.Dynamics;
 using Microsoft.Xna.Framework;
 
-using Axios.Engine.Log;
-
 namespace Axios.Engine
 {
     public abstract class SimpleAxiosGameObject : AxiosGameObject
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/SimpleDrawableAxiosGameObject.cs
--- a/axios/Engine/SimpleDrawableAxiosGameObject.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/SimpleDrawableAxiosGameObject.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,16 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using Axios.Engine.Interfaces;
+using FarseerPhysics.Common;
+using FarseerPhysics.Common.Decomposition;
+using FarseerPhysics.Common.PolygonManipulation;
+using FarseerPhysics.Dynamics;
+using FarseerPhysics.Factories;
+using FarseerPhysics.SamplesFramework;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using FarseerPhysics.Dynamics;
-using FarseerPhysics.SamplesFramework;
-using Axios.Engine.Interfaces;
-using FarseerPhysics.Common.Decomposition;
-using FarseerPhysics.Common;
-using FarseerPhysics.Factories;
-using FarseerPhysics.Common.PolygonManipulation;
 
 namespace Axios.Engine
 {
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/Singleton.cs
--- a/axios/Engine/Singleton.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/Singleton.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Axios.Engine
 {
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/Structures/AxiosPoint.cs
--- a/axios/Engine/Structures/AxiosPoint.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/Structures/AxiosPoint.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
+
 namespace Axios.Engine.Structures
 {
     public class AxiosPoint
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/Structures/AxiosRectangle.cs
--- a/axios/Engine/Structures/AxiosRectangle.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/Structures/AxiosRectangle.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Axios.Engine.Structures
 {
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/UI/AxiosButton.cs
--- a/axios/Engine/UI/AxiosButton.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/UI/AxiosButton.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
+
+using FarseerPhysics.SamplesFramework;
 using Microsoft.Xna.Framework.Graphics;
-using FarseerPhysics.SamplesFramework;
-using FarseerPhysics.Factories;
-using FarseerPhysics.Dynamics;
 
 namespace Axios.Engine.UI
 {
diff -r a2dd021b866c62048a501dd76c4b065552ceae1c -r c6bbde29ce55979282dcdc703d2d53dba5fb3e2b axios/Engine/UI/AxiosUIObject.cs
--- a/axios/Engine/UI/AxiosUIObject.cs	Fri Mar 23 23:56:23 2012 -0500
+++ b/axios/Engine/UI/AxiosUIObject.cs	Sat Mar 24 18:06:51 2012 -0500
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
-using Axios.Engine;
 
 namespace Axios.Engine.UI
 {