diff -r 46452db1a858e75e2b1e46d510d23de6a92326ac -r 3a4cc24bb53ec8ee3ac31a1b985eebec0c21712d axios_tennis.suo
Binary file axios_tennis.suo has changed
diff -r 46452db1a858e75e2b1e46d510d23de6a92326ac -r 3a4cc24bb53ec8ee3ac31a1b985eebec0c21712d axios_tennis/axios_tennis/Axios.Windows.dll
Binary file axios_tennis/axios_tennis/Axios.Windows.dll has changed
diff -r 46452db1a858e75e2b1e46d510d23de6a92326ac -r 3a4cc24bb53ec8ee3ac31a1b985eebec0c21712d axios_tennis/axios_tennis/Credits.cs
--- a/axios_tennis/axios_tennis/Credits.cs	Sun Apr 15 18:06:24 2012 -0500
+++ b/axios_tennis/axios_tennis/Credits.cs	Tue Apr 17 23:32:50 2012 -0500
@@ -12,9 +12,9 @@
         private Vector2 textpos;
         //private bool pause = false;
 
-        public override void LoadContent()
+        public override void  Activate(bool instancePreserved)
         {
-            base.LoadContent();
+            base.Activate(instancePreserved);
 
             StringBuilder sb = new StringBuilder();
 
@@ -74,7 +74,7 @@
 
             _credits_string = sb.ToString();
             textpos = new Vector2(-130, 0);
-            sf = ScreenManager.Content.Load<SpriteFont>("Fonts/credits");
+            sf = ScreenManager.Game.Content.Load<SpriteFont>("Fonts/credits");
         }
 
         public override void Update(GameTime gameTime, bool otherScreenHasFocus, bool coveredByOtherScreen)
diff -r 46452db1a858e75e2b1e46d510d23de6a92326ac -r 3a4cc24bb53ec8ee3ac31a1b985eebec0c21712d axios_tennis/axios_tennis/Game1.cs
--- a/axios_tennis/axios_tennis/Game1.cs	Sun Apr 15 18:06:24 2012 -0500
+++ b/axios_tennis/axios_tennis/Game1.cs	Tue Apr 17 23:32:50 2012 -0500
@@ -1,6 +1,7 @@
 using FarseerPhysics.SamplesFramework;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using GameStateManagement;
 
 namespace axios_tennis
 {
@@ -42,19 +43,19 @@
             BackgroundScreen bg = new BackgroundScreen();
 
 
-            MenuScreen ms = new MenuScreen("Axios Tennis");
+            //MenuScreen ms = new MenuScreen("Axios Tennis");
             TennisScreen ts = new TennisScreen();
             Credits cd = new Credits();
-            ms.AddMenuItem("", EntryType.Separator, null);
+            /*ms.AddMenuItem("", EntryType.Separator, null);
             ms.AddMenuItem("", EntryType.Separator, null);
             ms.AddMenuItem("Start", EntryType.Screen, ts);
             ms.AddMenuItem("", EntryType.Separator, null);
             ms.AddMenuItem("Credits", EntryType.Screen, cd);
             ms.AddMenuItem("", EntryType.Separator, null);
-            ms.AddMenuItem("Exit", EntryType.ExitItem, null);
+            ms.AddMenuItem("Exit", EntryType.ExitItem, null);*/
 
-            ScreenManager.AddScreen(bg);
-            ScreenManager.AddScreen(ms);
+            ScreenManager.AddScreen(bg, PlayerIndex.One);
+            ScreenManager.AddScreen(new TennisMainMenu(), PlayerIndex.One);
         }
 
         /// <summary>
diff -r 46452db1a858e75e2b1e46d510d23de6a92326ac -r 3a4cc24bb53ec8ee3ac31a1b985eebec0c21712d axios_tennis/axios_tennis/Objects/Ball.cs
--- a/axios_tennis/axios_tennis/Objects/Ball.cs	Sun Apr 15 18:06:24 2012 -0500
+++ b/axios_tennis/axios_tennis/Objects/Ball.cs	Tue Apr 17 23:32:50 2012 -0500
@@ -6,6 +6,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
+using GameStateManagement;
 
 namespace axios_tennis
 {
@@ -25,7 +26,7 @@
         {
             base.LoadContent(gameScreen);
             this.ConstantVelocity = new Vector2(7f, 7f);
-            this.Texture = gameScreen.ScreenManager.Content.Load<Texture2D>("ball");
+            this.Texture = gameScreen.ScreenManager.Game.Content.Load<Texture2D>("ball");
             this.Origin = new Vector2(this.Texture.Width / 2, this.Texture.Height / 2);
             this.BodyPart = BodyFactory.CreateCircle(gameScreen.World, ConvertUnits.ToSimUnits(this.Texture.Width / 2), 1f);
 
@@ -56,7 +57,7 @@
         }
 
 
-        public override void OnMouseDown(AxiosGameScreen gameScreen, InputHelper input)
+        public override void OnMouseDown(AxiosGameScreen gameScreen, InputState input)
         {
             KickBall();
             base.OnMouseDown(gameScreen, input);
@@ -78,16 +79,17 @@
             this.BodyPart.LinearVelocity = Vector2.Zero;
             this.BodyPart.Inertia = 0f;
         }
-        public override void HandleInput(AxiosGameScreen gameScreen, InputHelper input, GameTime gameTime)
+        public override void HandleInput(AxiosGameScreen gameScreen, InputState input, GameTime gameTime)
         {
             base.HandleInput(gameScreen, input, gameTime);
 
-            if (input.IsNewKeyPress(Keys.Space) || input.IsNewVirtualButtonPress(Buttons.A) || input.IsNewButtonPress(Buttons.A))
+            PlayerIndex i;
+            if (input.IsNewKeyPress(Keys.Space, PlayerIndex.One, out i) || input.IsNewVirtualButtonPress(Buttons.A) || input.IsNewButtonPress(Buttons.A, PlayerIndex.One, out i))
             {
                 KickBall();
             }
 
-            if (input.IsNewVirtualButtonPress(Buttons.B) || input.IsNewButtonPress(Buttons.B))
+            if (input.IsNewVirtualButtonPress(Buttons.B) || input.IsNewButtonPress(Buttons.B, PlayerIndex.One, out i))
             {
                 ResetBall();
             }
diff -r 46452db1a858e75e2b1e46d510d23de6a92326ac -r 3a4cc24bb53ec8ee3ac31a1b985eebec0c21712d axios_tennis/axios_tennis/Objects/Paddle.cs
--- a/axios_tennis/axios_tennis/Objects/Paddle.cs	Sun Apr 15 18:06:24 2012 -0500
+++ b/axios_tennis/axios_tennis/Objects/Paddle.cs	Tue Apr 17 23:32:50 2012 -0500
@@ -23,7 +23,7 @@
         {
             base.LoadContent(gameScreen);
 
-            this.Texture = gameScreen.ScreenManager.Content.Load<Texture2D>("paddle");
+            this.Texture = gameScreen.ScreenManager.Game.Content.Load<Texture2D>("paddle");
             this.Origin = new Vector2(this.Texture.Width / 2, this.Texture.Height / 2);
             this.BodyPart = BodyFactory.CreateRectangle(gameScreen.World, ConvertUnits.ToSimUnits(Texture.Width), ConvertUnits.ToSimUnits(Texture.Height), 1f);
 
diff -r 46452db1a858e75e2b1e46d510d23de6a92326ac -r 3a4cc24bb53ec8ee3ac31a1b985eebec0c21712d axios_tennis/axios_tennis/TennisScreen.cs
--- a/axios_tennis/axios_tennis/TennisScreen.cs	Sun Apr 15 18:06:24 2012 -0500
+++ b/axios_tennis/axios_tennis/TennisScreen.cs	Tue Apr 17 23:32:50 2012 -0500
@@ -5,6 +5,9 @@
 using Axios.Engine.Extenions;
 using Axios.Engine.UI;
 using Axios;
+using System;
+using GameStateManagement;
+using Microsoft.Xna.Framework.Input;
 
 namespace axios_tennis
 {
@@ -28,13 +31,15 @@
             this.HasVirtualStick = true;
             this.HasCursor = true;
             EnableCameraControl = false;
+            TransitionOnTime = TimeSpan.FromSeconds(1.5);
+            TransitionOffTime = TimeSpan.FromSeconds(0.5);
         }
 
-        public override void LoadContent()
+        public override void  Activate(bool instancePreserved)
         {
-            base.LoadContent();
+ 	        base.Activate(instancePreserved);
             int xcount, ycount;
-            Texture2D _blocks = ScreenManager.Content.Load<Texture2D>("blocks");
+            Texture2D _blocks = ScreenManager.Game.Content.Load<Texture2D>("blocks");
             Texture2D[,] _blocktextures = _blocks.Split(32, 32, 8, 8, out xcount, out ycount);
 
 #if WINDOWS_PHONE
@@ -60,7 +65,7 @@
             _pwall = new Wall(new Vector2(-ConvertUnits.ToSimUnits(ScreenManager.GraphicsDevice.Viewport.Width) / 2f, 0), "pwall");
             _ewall = new Wall(new Vector2(ConvertUnits.ToSimUnits(ScreenManager.GraphicsDevice.Viewport.Width) / 2f, 0), "ewall");
 
-            _sf = ScreenManager.Content.Load<SpriteFont>("scorefont");
+            _sf = ScreenManager.Game.Content.Load<SpriteFont>("scorefont");
 
             _ppaddle.AllowAutomaticMouseJoint = true;
             AddGameObject(_ewall);
@@ -71,28 +76,34 @@
             AddGameObject(_ball);
         }
 
-        void b_MouseDown(object sender, AxiosGameScreen gameScreen, InputHelper input)
+        /*void b_MouseDown(object sender, AxiosGameScreen gameScreen, InputState input)
         {
             if (HasVirtualStick)
                 HasVirtualStick = false;
             else
                 HasVirtualStick = true;
-        }
+        }*/
 
-        public override void HandleInput(InputHelper input, GameTime gameTime)
+        public override void HandleInput(GameTime gameTime, InputState input)
         {
-            base.HandleInput(input, gameTime);
+            base.HandleInput(gameTime, input);
 
             
             //This must be handled in the screen because there are multiple paddles
             
             if (_ppaddle != null)
             {
-                if (input.VirtualState.ThumbSticks.Left.Y > 0 || input.GamePadState.ThumbSticks.Left.Y > 0)
+                if (input.VirtualState.ThumbSticks.Left.Y > 0 ||
+                    input.CurrentGamePadStates[0].ThumbSticks.Left.Y > 0 ||
+                    input.CurrentKeyboardStates[0].IsKeyDown(Keys.Down)
+                    )
                 {
                     _ppaddle.PaddleJoint.MotorSpeed = -40f;
                 }
-                else if (input.VirtualState.ThumbSticks.Left.Y < 0 || input.GamePadState.ThumbSticks.Left.Y < 0)
+                else if (input.VirtualState.ThumbSticks.Left.Y < 0 ||
+                    input.CurrentGamePadStates[0].ThumbSticks.Left.Y < 0 ||
+                    input.CurrentKeyboardStates[0].IsKeyDown(Keys.Up)
+                    )
                 {
                     _ppaddle.PaddleJoint.MotorSpeed = 40f;
                 }
diff -r 46452db1a858e75e2b1e46d510d23de6a92326ac -r 3a4cc24bb53ec8ee3ac31a1b985eebec0c21712d axios_tennis/axios_tennis/axios_tennis.csproj
--- a/axios_tennis/axios_tennis/axios_tennis.csproj	Sun Apr 15 18:06:24 2012 -0500
+++ b/axios_tennis/axios_tennis/axios_tennis.csproj	Tue Apr 17 23:32:50 2012 -0500
@@ -98,6 +98,7 @@
     <Compile Include="Objects\Border.cs" />
     <Compile Include="Objects\Paddle.cs" />
     <Compile Include="Objects\Wall.cs" />
+    <Compile Include="TennisMainMenu.cs" />
     <Compile Include="TennisScreen.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Program.cs" />
diff -r 46452db1a858e75e2b1e46d510d23de6a92326ac -r 3a4cc24bb53ec8ee3ac31a1b985eebec0c21712d axios_tennis/axios_tennis/axios_tennis_wp7.csproj
--- a/axios_tennis/axios_tennis/axios_tennis_wp7.csproj	Sun Apr 15 18:06:24 2012 -0500
+++ b/axios_tennis/axios_tennis/axios_tennis_wp7.csproj	Tue Apr 17 23:32:50 2012 -0500
@@ -80,6 +80,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Game1.cs" />
+    <Compile Include="TennisMainMenu.cs" />
     <Compile Include="TennisScreen.cs" />
   </ItemGroup>
   <ItemGroup>
diff -r 46452db1a858e75e2b1e46d510d23de6a92326ac -r 3a4cc24bb53ec8ee3ac31a1b985eebec0c21712d axios_tennis/axios_tennis/axios_tennis_xbox360.csproj
--- a/axios_tennis/axios_tennis/axios_tennis_xbox360.csproj	Sun Apr 15 18:06:24 2012 -0500
+++ b/axios_tennis/axios_tennis/axios_tennis_xbox360.csproj	Tue Apr 17 23:32:50 2012 -0500
@@ -76,6 +76,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Game1.cs" />
+    <Compile Include="TennisMainMenu.cs" />
     <Compile Include="TennisScreen.cs" />
   </ItemGroup>
   <ItemGroup>
diff -r 46452db1a858e75e2b1e46d510d23de6a92326ac -r 3a4cc24bb53ec8ee3ac31a1b985eebec0c21712d axios_tennis/axios_tennisContent/axios_tennisContent.contentproj
--- a/axios_tennis/axios_tennisContent/axios_tennisContent.contentproj	Sun Apr 15 18:06:24 2012 -0500
+++ b/axios_tennis/axios_tennisContent/axios_tennisContent.contentproj	Tue Apr 17 23:32:50 2012 -0500
@@ -189,6 +189,13 @@
       <Processor>TextureProcessor</Processor>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="background.png">
+      <Name>background</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.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 -r 46452db1a858e75e2b1e46d510d23de6a92326ac -r 3a4cc24bb53ec8ee3ac31a1b985eebec0c21712d axios_tennis/axios_tennisContent/background.png
Binary file axios_tennis/axios_tennisContent/background.png has changed