diff --git a/engine/unity5/Assets/MainMenu.unity b/engine/unity5/Assets/MainMenu.unity
index b522ea0072..915bdb3fb5 100644
--- a/engine/unity5/Assets/MainMenu.unity
+++ b/engine/unity5/Assets/MainMenu.unity
@@ -42,7 +42,7 @@ RenderSettings:
 --- !u!157 &4
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 9
+  serializedVersion: 11
   m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
@@ -54,7 +54,7 @@ LightmapSettings:
     m_EnableBakedLightmaps: 1
     m_EnableRealtimeLightmaps: 0
   m_LightmapEditorSettings:
-    serializedVersion: 8
+    serializedVersion: 9
     m_Resolution: 1
     m_BakeResolution: 50
     m_TextureWidth: 1024
@@ -77,17 +77,20 @@ LightmapSettings:
     m_PVRDirectSampleCount: 32
     m_PVRSampleCount: 500
     m_PVRBounces: 2
-    m_PVRFiltering: 0
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
     m_PVRFilteringMode: 1
     m_PVRCulling: 1
     m_PVRFilteringGaussRadiusDirect: 1
     m_PVRFilteringGaussRadiusIndirect: 5
     m_PVRFilteringGaussRadiusAO: 2
-    m_PVRFilteringAtrousColorSigma: 1
-    m_PVRFilteringAtrousNormalSigma: 1
-    m_PVRFilteringAtrousPositionSigma: 1
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ShowResolutionOverlay: 1
   m_LightingDataAsset: {fileID: 0}
-  m_ShadowMaskMode: 2
+  m_UseShadowmask: 1
 --- !u!196 &5
 NavMeshSettings:
   serializedVersion: 2
@@ -107,6 +110,8 @@ NavMeshSettings:
     manualTileSize: 0
     tileSize: 256
     accuratePlacement: 0
+    debug:
+      m_Flags: 0
   m_NavMeshData: {fileID: 0}
 --- !u!1 &5751812
 GameObject:
@@ -4748,11 +4753,11 @@ Camera:
   m_TargetEye: 3
   m_HDR: 0
   m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
   m_ForceIntoRT: 0
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
-  m_StereoMirrorMode: 0
 --- !u!81 &509596251
 AudioListener:
   m_ObjectHideFlags: 0
@@ -7020,7 +7025,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &733606799
 RectTransform:
   m_ObjectHideFlags: 0
@@ -17933,7 +17938,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1769824029
 RectTransform:
   m_ObjectHideFlags: 0
diff --git a/engine/unity5/Assets/Scripts/DriveJoints.cs b/engine/unity5/Assets/Scripts/DriveJoints.cs
index eb6b81b532..d494668632 100644
--- a/engine/unity5/Assets/Scripts/DriveJoints.cs
+++ b/engine/unity5/Assets/Scripts/DriveJoints.cs
@@ -107,13 +107,13 @@ public static void UpdateManipulatorMotors(RigidNode_Base skeleton, UnityPacket.
             can = new float[10];
         }
 
-            pwm[4] +=
-                 (InputControl.GetAxis(Controls.axes[controlIndex].pwm4Axes) * SPEED_ARROW_PWM);
-            pwm[5] +=
-                 (InputControl.GetAxis(Controls.axes[controlIndex].pwm5Axes) * SPEED_ARROW_PWM);
+        pwm[4] +=
+             (InputControl.GetAxis(Controls.axes[controlIndex].pwm4Axes) * SPEED_ARROW_PWM);
+        pwm[5] +=
+             (InputControl.GetAxis(Controls.axes[controlIndex].pwm5Axes) * SPEED_ARROW_PWM);
 
-            pwm[6] +=
-                 (InputControl.GetAxis(Controls.axes[controlIndex].pwm6Axes) * SPEED_ARROW_PWM);
+        pwm[6] +=
+             (InputControl.GetAxis(Controls.axes[controlIndex].pwm6Axes) * SPEED_ARROW_PWM);
 
         listOfSubNodes.Clear();
         skeleton.ListAllNodes(listOfSubNodes);
@@ -198,12 +198,12 @@ public static void UpdateAllMotors(RigidNode_Base skeleton, UnityPacket.OutputSt
         }
 
         if (IsMecanum)
-        {   
+        {
             #region Mecanum Drive
             pwm[(int)MecanumPorts.FRONT_RIGHT] +=
                 (InputControl.GetAxis(Controls.axes[controlIndex].vertical) * -SPEED_ARROW_PWM) +
-                (InputControl.GetAxis(Controls.axes[controlIndex].horizontal) * - SPEED_ARROW_PWM) +
-                (InputControl.GetAxis(Controls.axes[controlIndex].pwm2Axes) *  -SPEED_ARROW_PWM);
+                (InputControl.GetAxis(Controls.axes[controlIndex].horizontal) * -SPEED_ARROW_PWM) +
+                (InputControl.GetAxis(Controls.axes[controlIndex].pwm2Axes) * -SPEED_ARROW_PWM);
 
             pwm[(int)MecanumPorts.FRONT_LEFT] +=
                 (InputControl.GetAxis(Controls.axes[controlIndex].vertical) * SPEED_ARROW_PWM) +
@@ -214,12 +214,12 @@ public static void UpdateAllMotors(RigidNode_Base skeleton, UnityPacket.OutputSt
             pwm[(int)MecanumPorts.BACK_RIGHT] +=
                 (InputControl.GetAxis(Controls.axes[controlIndex].vertical) * -SPEED_ARROW_PWM) +
                 (InputControl.GetAxis(Controls.axes[controlIndex].horizontal) * -SPEED_ARROW_PWM) +
-                (InputControl.GetAxis(Controls.axes[controlIndex].pwm2Axes) * 0.25f); 
+                (InputControl.GetAxis(Controls.axes[controlIndex].pwm2Axes) * 0.25f);
 
             pwm[(int)MecanumPorts.BACK_LEFT] +=
                 (InputControl.GetAxis(Controls.axes[controlIndex].vertical) * SPEED_ARROW_PWM) +
                 (InputControl.GetAxis(Controls.axes[controlIndex].horizontal) * SPEED_ARROW_PWM) +
-                (InputControl.GetAxis(Controls.axes[controlIndex].pwm2Axes) * 0.25f); 
+                (InputControl.GetAxis(Controls.axes[controlIndex].pwm2Axes) * 0.25f);
             pwm[4] +=
                 (InputControl.GetAxis(Controls.axes[controlIndex].pwm4Axes) * SPEED_ARROW_PWM);
 
@@ -228,6 +228,15 @@ public static void UpdateAllMotors(RigidNode_Base skeleton, UnityPacket.OutputSt
 
             pwm[6] +=
                 (InputControl.GetAxis(Controls.axes[controlIndex].pwm6Axes) * SPEED_ARROW_PWM);
+
+            pwm[7] +=
+                (InputControl.GetAxis(Controls.axes[controlIndex].pwm7Axes) * SPEED_ARROW_PWM);
+
+            pwm[8] +=
+                (InputControl.GetAxis(Controls.axes[controlIndex].pwm8Axes) * SPEED_ARROW_PWM);
+
+            pwm[9] +=
+                (InputControl.GetAxis(Controls.axes[controlIndex].pwm9Axes) * SPEED_ARROW_PWM);
             #endregion
         }
 
@@ -262,6 +271,15 @@ public static void UpdateAllMotors(RigidNode_Base skeleton, UnityPacket.OutputSt
 
             pwm[6] +=
                 (InputControl.GetAxis(Controls.axes[controlIndex].pwm6Axes) * SPEED_ARROW_PWM);
+
+            pwm[7] +=
+                (InputControl.GetAxis(Controls.axes[controlIndex].pwm7Axes) * SPEED_ARROW_PWM);
+
+            pwm[8] +=
+                (InputControl.GetAxis(Controls.axes[controlIndex].pwm8Axes) * SPEED_ARROW_PWM);
+
+            pwm[9] +=
+                (InputControl.GetAxis(Controls.axes[controlIndex].pwm9Axes) * SPEED_ARROW_PWM);
             #endregion
         }
         else
@@ -301,6 +319,15 @@ public static void UpdateAllMotors(RigidNode_Base skeleton, UnityPacket.OutputSt
 
             pwm[6] +=
                 (InputControl.GetAxis(Controls.axes[controlIndex].pwm6Axes) * SPEED_ARROW_PWM);
+
+            pwm[7] +=
+                (InputControl.GetAxis(Controls.axes[controlIndex].pwm7Axes) * SPEED_ARROW_PWM);
+
+            pwm[8] +=
+                (InputControl.GetAxis(Controls.axes[controlIndex].pwm8Axes) * SPEED_ARROW_PWM);
+
+            pwm[9] +=
+                (InputControl.GetAxis(Controls.axes[controlIndex].pwm9Axes) * SPEED_ARROW_PWM);
             #endregion
         }
 
diff --git a/engine/unity5/Assets/Scripts/InputControl/Controls.cs b/engine/unity5/Assets/Scripts/InputControl/Controls.cs
index 21ebc01041..35791cabd6 100644
--- a/engine/unity5/Assets/Scripts/InputControl/Controls.cs
+++ b/engine/unity5/Assets/Scripts/InputControl/Controls.cs
@@ -61,6 +61,12 @@ public struct Buttons
         public KeyMapping pwm5Neg;
         public KeyMapping pwm6Plus;
         public KeyMapping pwm6Neg;
+        public KeyMapping pwm7Plus;
+        public KeyMapping pwm7Neg;
+        public KeyMapping pwm8Plus;
+        public KeyMapping pwm8Neg;
+        public KeyMapping pwm9Plus;
+        public KeyMapping pwm9Neg;
 
         //Other controls
         public KeyMapping resetRobot;
@@ -93,6 +99,9 @@ public struct Axes
         public Axis pwm4Axes;
         public Axis pwm5Axes;
         public Axis pwm6Axes;
+        public Axis pwm7Axes;
+        public Axis pwm8Axes;
+        public Axis pwm9Axes;
     }
 
     /// <summary>
@@ -327,6 +336,12 @@ public static void ArcadeControls()
         buttons[0].pwm5Neg = InputControl.setKey("1: PWM 5 Negative", PlayerOneIndex, KeyCode.Alpha8, new JoystickInput(JoystickAxis.Axis7Negative, Joystick.Joystick1), false);
         buttons[0].pwm6Plus = InputControl.setKey("1: PWM 6 Positive", PlayerOneIndex, KeyCode.Alpha9, new JoystickInput(JoystickAxis.Axis8Positive, Joystick.Joystick1), false);
         buttons[0].pwm6Neg = InputControl.setKey("1: PWM 6 Negative", PlayerOneIndex, KeyCode.Alpha0, new JoystickInput(JoystickAxis.Axis8Negative, Joystick.Joystick1), false);
+        buttons[0].pwm7Plus = InputControl.setKey("1: PWM 7 Positive", PlayerOneIndex, KeyCode.Slash, new JoystickInput(JoystickAxis.Axis9Positive, Joystick.Joystick1), false);
+        buttons[0].pwm7Neg = InputControl.setKey("1: PWM 7 Negative", PlayerOneIndex, KeyCode.Period, new JoystickInput(JoystickAxis.Axis9Negative, Joystick.Joystick1), false);
+        buttons[0].pwm8Plus = InputControl.setKey("1: PWM 8 Positive", PlayerOneIndex, KeyCode.Comma, new JoystickInput(JoystickAxis.Axis10Positive, Joystick.Joystick1), false);
+        buttons[0].pwm8Neg = InputControl.setKey("1: PWM 8 Negative", PlayerOneIndex, KeyCode.M, new JoystickInput(JoystickAxis.Axis10Negative, Joystick.Joystick1), false);
+        buttons[0].pwm9Plus = InputControl.setKey("1: PWM 9 Positive", PlayerOneIndex, KeyCode.N, new JoystickInput(JoystickAxis.Axis11Positive, Joystick.Joystick1), false);
+        buttons[0].pwm9Neg = InputControl.setKey("1: PWM 9 Negative", PlayerOneIndex, KeyCode.B, new JoystickInput(JoystickAxis.Axis11Negative, Joystick.Joystick1), false);
 
         //Other Controls
         buttons[0].resetRobot = InputControl.setKey("1: Reset Robot", PlayerOneIndex, KeyCode.R, new JoystickInput(JoystickButton.Button8, Joystick.Joystick1), false);
@@ -349,6 +364,9 @@ public static void ArcadeControls()
         axes[0].pwm4Axes = InputControl.setAxis("1: PWM 4 Axis 6", PlayerOneIndex, buttons[0].pwm4Neg, buttons[0].pwm4Plus, false);
         axes[0].pwm5Axes = InputControl.setAxis("1: PWM 5 Axis 7", PlayerOneIndex, buttons[0].pwm5Neg, buttons[0].pwm5Plus, false);
         axes[0].pwm6Axes = InputControl.setAxis("1: PWM 6 Axis 8", PlayerOneIndex, buttons[0].pwm6Neg, buttons[0].pwm6Plus, false);
+        axes[0].pwm7Axes = InputControl.setAxis("1: PWM 7 Axis 9", PlayerOneIndex, buttons[0].pwm7Neg, buttons[0].pwm7Plus, false);
+        axes[0].pwm8Axes = InputControl.setAxis("1: PWM 8 Axis 10", PlayerOneIndex, buttons[0].pwm8Neg, buttons[0].pwm8Plus, false);
+        axes[0].pwm9Axes = InputControl.setAxis("1: PWM 9 Axis 11", PlayerOneIndex, buttons[0].pwm9Neg, buttons[0].pwm9Plus, false);
         #endregion
 
         #region Player 2 Controls
@@ -369,7 +387,13 @@ public static void ArcadeControls()
         buttons[1].pwm5Neg = InputControl.setKey("2: PWM 5 Negative", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis7Negative, Joystick.Joystick2), false);
         buttons[1].pwm6Plus = InputControl.setKey("2: PWM 6 Positive", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis8Positive, Joystick.Joystick2), false);
         buttons[1].pwm6Neg = InputControl.setKey("2: PWM 6 Negative", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis8Negative, Joystick.Joystick2), false);
-
+        buttons[1].pwm7Plus = InputControl.setKey("2: PWM 7 Positive", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis9Positive, Joystick.Joystick2), false);
+        buttons[1].pwm7Neg = InputControl.setKey("2: PWM 7 Negative", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis9Negative, Joystick.Joystick2), false);
+        buttons[1].pwm8Plus = InputControl.setKey("2: PWM 8 Positive", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis10Positive, Joystick.Joystick2), false);
+        buttons[1].pwm8Neg = InputControl.setKey("2: PWM 8 Negative", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis10Negative, Joystick.Joystick2), false);
+        buttons[1].pwm9Plus = InputControl.setKey("2: PWM 9 Positive", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis11Positive, Joystick.Joystick2), false);
+        buttons[1].pwm9Neg = InputControl.setKey("2: PWM 9 Negative", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis11Negative, Joystick.Joystick2), false);
+        
         //Other Controls
         buttons[1].resetRobot = InputControl.setKey("2: Reset Robot", PlayerTwoIndex, new JoystickInput(JoystickButton.Button8, Joystick.Joystick2), false);
         buttons[1].cameraToggle = InputControl.setKey("2: Camera Toggle", PlayerTwoIndex, new JoystickInput(JoystickButton.Button7, Joystick.Joystick2), false);
@@ -391,6 +415,9 @@ public static void ArcadeControls()
         axes[1].pwm4Axes = InputControl.setAxis("2: PWM 4 Axis 6", PlayerOneIndex, buttons[1].pwm4Neg, buttons[1].pwm4Plus, false);
         axes[1].pwm5Axes = InputControl.setAxis("2: PWM 5 Axis 7", PlayerOneIndex, buttons[1].pwm5Neg, buttons[1].pwm5Plus, false);
         axes[1].pwm6Axes = InputControl.setAxis("2: PWM 6 Axis 8", PlayerOneIndex, buttons[1].pwm6Neg, buttons[1].pwm6Plus, false);
+        axes[1].pwm7Axes = InputControl.setAxis("2: PWM 7 Axis 9", PlayerOneIndex, buttons[1].pwm7Neg, buttons[1].pwm7Plus, false);
+        axes[1].pwm8Axes = InputControl.setAxis("2: PWM 8 Axis 10", PlayerOneIndex, buttons[1].pwm8Neg, buttons[1].pwm8Plus, false);
+        axes[1].pwm9Axes = InputControl.setAxis("2: PWM 9 Axis 11", PlayerOneIndex, buttons[1].pwm9Neg, buttons[1].pwm9Plus, false);
         #endregion
 
         #region Player 3 Controls
@@ -411,6 +438,12 @@ public static void ArcadeControls()
         buttons[2].pwm5Neg = InputControl.setKey("3: PWM 5 Negative", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis7Negative, Joystick.Joystick3), false);
         buttons[2].pwm6Plus = InputControl.setKey("3: PWM 6 Positive", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis8Positive, Joystick.Joystick3), false);
         buttons[2].pwm6Neg = InputControl.setKey("3: PWM 6 Negative", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis8Negative, Joystick.Joystick3), false);
+        buttons[2].pwm7Plus = InputControl.setKey("3: PWM 7 Positive", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis9Positive, Joystick.Joystick3), false);
+        buttons[2].pwm7Neg = InputControl.setKey("3: PWM 7 Negative", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis9Negative, Joystick.Joystick3), false);
+        buttons[2].pwm8Plus = InputControl.setKey("3: PWM 8 Positive", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis10Positive, Joystick.Joystick3), false);
+        buttons[2].pwm8Neg = InputControl.setKey("3: PWM 8 Negative", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis10Negative, Joystick.Joystick3), false);
+        buttons[2].pwm9Plus = InputControl.setKey("3: PWM 9 Positive", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis11Positive, Joystick.Joystick3), false);
+        buttons[2].pwm9Neg = InputControl.setKey("3: PWM 9 Negative", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis11Negative, Joystick.Joystick3), false);
 
         //Other Controls
         buttons[2].resetRobot = InputControl.setKey("3: Reset Robot", PlayerThreeIndex, new JoystickInput(JoystickButton.Button8, Joystick.Joystick3), false);
@@ -433,6 +466,9 @@ public static void ArcadeControls()
         axes[2].pwm4Axes = InputControl.setAxis("3: PWM 4 Axis 6", PlayerOneIndex, buttons[2].pwm4Neg, buttons[2].pwm4Plus, false);
         axes[2].pwm5Axes = InputControl.setAxis("3: PWM 5 Axis 7", PlayerOneIndex, buttons[2].pwm5Neg, buttons[2].pwm5Plus, false);
         axes[2].pwm6Axes = InputControl.setAxis("3: PWM 6 Axis 8", PlayerOneIndex, buttons[2].pwm6Neg, buttons[2].pwm6Plus, false);
+        axes[2].pwm7Axes = InputControl.setAxis("3: PWM 7 Axis 9", PlayerOneIndex, buttons[2].pwm7Neg, buttons[2].pwm7Plus, false);
+        axes[2].pwm8Axes = InputControl.setAxis("3: PWM 8 Axis 10", PlayerOneIndex, buttons[2].pwm8Neg, buttons[2].pwm8Plus, false);
+        axes[2].pwm9Axes = InputControl.setAxis("3: PWM 9 Axis 11", PlayerOneIndex, buttons[2].pwm9Neg, buttons[2].pwm9Plus, false);
         #endregion
 
         #region Player 4 Controls
@@ -453,6 +489,12 @@ public static void ArcadeControls()
         buttons[3].pwm5Neg = InputControl.setKey("4: PWM 5 Negative", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis7Negative, Joystick.Joystick4), false);
         buttons[3].pwm6Plus = InputControl.setKey("4: PWM 6 Positive", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis8Positive, Joystick.Joystick4), false);
         buttons[3].pwm6Neg = InputControl.setKey("4: PWM 6 Negative", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis8Negative, Joystick.Joystick4), false);
+        buttons[3].pwm7Plus = InputControl.setKey("4: PWM 7 Positive", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis9Positive, Joystick.Joystick4), false);
+        buttons[3].pwm7Neg = InputControl.setKey("4: PWM 7 Negative", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis9Negative, Joystick.Joystick4), false);
+        buttons[3].pwm8Plus = InputControl.setKey("4: PWM 8 Positive", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis10Positive, Joystick.Joystick4), false);
+        buttons[3].pwm8Neg = InputControl.setKey("4: PWM 8 Negative", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis10Negative, Joystick.Joystick4), false);
+        buttons[3].pwm9Plus = InputControl.setKey("4: PWM 9 Positive", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis11Positive, Joystick.Joystick4), false);
+        buttons[3].pwm9Neg = InputControl.setKey("4: PWM 9 Negative", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis11Negative, Joystick.Joystick4), false);
 
         //Other Controls
         buttons[3].resetRobot = InputControl.setKey("4: Reset Robot", PlayerFourIndex, new JoystickInput(JoystickButton.Button8, Joystick.Joystick4), false);
@@ -475,6 +517,9 @@ public static void ArcadeControls()
         axes[3].pwm4Axes = InputControl.setAxis("4: PWM 4 Axis 6", PlayerOneIndex, buttons[3].pwm4Neg, buttons[3].pwm4Plus, false);
         axes[3].pwm5Axes = InputControl.setAxis("4: PWM 5 Axis 7", PlayerOneIndex, buttons[3].pwm5Neg, buttons[3].pwm5Plus, false);
         axes[3].pwm6Axes = InputControl.setAxis("4: PWM 6 Axis 8", PlayerOneIndex, buttons[3].pwm6Neg, buttons[3].pwm6Plus, false);
+        axes[3].pwm7Axes = InputControl.setAxis("4: PWM 7 Axis 9", PlayerOneIndex, buttons[3].pwm7Neg, buttons[3].pwm7Plus, false);
+        axes[3].pwm8Axes = InputControl.setAxis("4: PWM 8 Axis 10", PlayerOneIndex, buttons[3].pwm8Neg, buttons[3].pwm8Plus, false);
+        axes[3].pwm9Axes = InputControl.setAxis("4: PWM 9 Axis 11", PlayerOneIndex, buttons[3].pwm9Neg, buttons[3].pwm9Plus, false);
         #endregion
 
         #region Player 5 Controls
@@ -495,6 +540,12 @@ public static void ArcadeControls()
         buttons[4].pwm5Neg = InputControl.setKey("5: PWM 5 Negative", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis7Negative, Joystick.Joystick5), false);
         buttons[4].pwm6Plus = InputControl.setKey("5: PWM 6 Positive", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis8Positive, Joystick.Joystick5), false);
         buttons[4].pwm6Neg = InputControl.setKey("5: PWM 6 Negative", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis8Negative, Joystick.Joystick5), false);
+        buttons[4].pwm7Plus = InputControl.setKey("5: PWM 7 Positive", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis9Positive, Joystick.Joystick5), false);
+        buttons[4].pwm7Neg = InputControl.setKey("5: PWM 7 Negative", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis9Negative, Joystick.Joystick5), false);
+        buttons[4].pwm8Plus = InputControl.setKey("5: PWM 8 Positive", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis10Positive, Joystick.Joystick5), false);
+        buttons[4].pwm8Neg = InputControl.setKey("5: PWM 8 Negative", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis10Negative, Joystick.Joystick5), false);
+        buttons[4].pwm9Plus = InputControl.setKey("5: PWM 9 Positive", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis11Positive, Joystick.Joystick5), false);
+        buttons[4].pwm9Neg = InputControl.setKey("5: PWM 9 Negative", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis11Negative, Joystick.Joystick5), false);
 
         //Other Controls
         buttons[4].resetRobot = InputControl.setKey("5: Reset Robot", PlayerFiveIndex, new JoystickInput(JoystickButton.Button8, Joystick.Joystick5), false);
@@ -517,6 +568,9 @@ public static void ArcadeControls()
         axes[4].pwm4Axes = InputControl.setAxis("5: PWM 4 Axis 6", PlayerOneIndex, buttons[4].pwm4Neg, buttons[4].pwm4Plus, false);
         axes[4].pwm5Axes = InputControl.setAxis("5: PWM 5 Axis 7", PlayerOneIndex, buttons[4].pwm5Neg, buttons[4].pwm5Plus, false);
         axes[4].pwm6Axes = InputControl.setAxis("5: PWM 6 Axis 8", PlayerOneIndex, buttons[4].pwm6Neg, buttons[4].pwm6Plus, false);
+        axes[4].pwm7Axes = InputControl.setAxis("5: PWM 7 Axis 9", PlayerOneIndex, buttons[4].pwm7Neg, buttons[4].pwm7Plus, false);
+        axes[4].pwm8Axes = InputControl.setAxis("5: PWM 8 Axis 10", PlayerOneIndex, buttons[4].pwm8Neg, buttons[4].pwm8Plus, false);
+        axes[4].pwm9Axes = InputControl.setAxis("5: PWM 9 Axis 11", PlayerOneIndex, buttons[4].pwm9Neg, buttons[4].pwm9Plus, false);
         #endregion
 
         #region Player 6 Controls
@@ -537,6 +591,12 @@ public static void ArcadeControls()
         buttons[5].pwm5Neg = InputControl.setKey("6: PWM 5 Negative", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis7Negative, Joystick.Joystick6), false);
         buttons[5].pwm6Plus = InputControl.setKey("6: PWM 6 Positive", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis8Positive, Joystick.Joystick6), false);
         buttons[5].pwm6Neg = InputControl.setKey("6: PWM 6 Negative", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis8Negative, Joystick.Joystick6), false);
+        buttons[5].pwm7Plus = InputControl.setKey("6: PWM 7 Positive", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis9Positive, Joystick.Joystick6), false);
+        buttons[5].pwm7Neg = InputControl.setKey("6: PWM 7 Negative", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis9Negative, Joystick.Joystick6), false);
+        buttons[5].pwm8Plus = InputControl.setKey("6: PWM 8 Positive", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis10Positive, Joystick.Joystick6), false);
+        buttons[5].pwm8Neg = InputControl.setKey("6: PWM 8 Negative", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis10Negative, Joystick.Joystick6), false);
+        buttons[5].pwm9Plus = InputControl.setKey("6: PWM 9 Positive", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis11Positive, Joystick.Joystick6), false);
+        buttons[5].pwm9Neg = InputControl.setKey("6: PWM 9 Negative", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis11Negative, Joystick.Joystick6), false);
 
         //Other Controls
         buttons[5].resetRobot = InputControl.setKey("6: Reset Robot", PlayerSixIndex, new JoystickInput(JoystickButton.Button8, Joystick.Joystick6), false);
@@ -559,6 +619,9 @@ public static void ArcadeControls()
         axes[5].pwm4Axes = InputControl.setAxis("6: PWM 4 Axis 6", PlayerOneIndex, buttons[5].pwm4Neg, buttons[5].pwm4Plus, false);
         axes[5].pwm5Axes = InputControl.setAxis("6: PWM 5 Axis 7", PlayerOneIndex, buttons[5].pwm5Neg, buttons[5].pwm5Plus, false);
         axes[5].pwm6Axes = InputControl.setAxis("6: PWM 6 Axis 8", PlayerOneIndex, buttons[5].pwm6Neg, buttons[5].pwm6Plus, false);
+        axes[5].pwm7Axes = InputControl.setAxis("6: PWM 7 Axis 9", PlayerOneIndex, buttons[5].pwm7Neg, buttons[5].pwm7Plus, false);
+        axes[5].pwm8Axes = InputControl.setAxis("6: PWM 8 Axis 10", PlayerOneIndex, buttons[5].pwm8Neg, buttons[5].pwm8Plus, false);
+        axes[5].pwm9Axes = InputControl.setAxis("6: PWM 9 Axis 11", PlayerOneIndex, buttons[5].pwm9Neg, buttons[5].pwm9Plus, false);
         #endregion
     }
 
@@ -586,6 +649,12 @@ public static void TankControls()
         buttons[0].pwm5Neg = InputControl.setKey("1: PWM 5 Negative", PlayerOneIndex, KeyCode.Alpha8, new JoystickInput(JoystickAxis.Axis7Negative, Joystick.Joystick1), true);
         buttons[0].pwm6Plus = InputControl.setKey("1: PWM 6 Positive", PlayerOneIndex, KeyCode.Alpha9, new JoystickInput(JoystickAxis.Axis8Positive, Joystick.Joystick1), true);
         buttons[0].pwm6Neg = InputControl.setKey("1: PWM 6 Negative", PlayerOneIndex, KeyCode.Alpha0, new JoystickInput(JoystickAxis.Axis8Negative, Joystick.Joystick1), true);
+        buttons[0].pwm7Plus = InputControl.setKey("1: PWM 7 Positive", PlayerOneIndex, KeyCode.Slash, new JoystickInput(JoystickAxis.Axis9Positive, Joystick.Joystick1), true);
+        buttons[0].pwm7Neg = InputControl.setKey("1: PWM 7 Negative", PlayerOneIndex, KeyCode.Period, new JoystickInput(JoystickAxis.Axis9Negative, Joystick.Joystick1), true);
+        buttons[0].pwm8Plus = InputControl.setKey("1: PWM 8 Positive", PlayerOneIndex, KeyCode.Comma, new JoystickInput(JoystickAxis.Axis10Positive, Joystick.Joystick1), true);
+        buttons[0].pwm8Neg = InputControl.setKey("1: PWM 8 Negative", PlayerOneIndex, KeyCode.M, new JoystickInput(JoystickAxis.Axis10Negative, Joystick.Joystick1), true);
+        buttons[0].pwm9Plus = InputControl.setKey("1: PWM 9 Positive", PlayerOneIndex, KeyCode.N, new JoystickInput(JoystickAxis.Axis11Positive, Joystick.Joystick1), true);
+        buttons[0].pwm9Neg = InputControl.setKey("1: PWM 9 Negative", PlayerOneIndex, KeyCode.B, new JoystickInput(JoystickAxis.Axis12Negative, Joystick.Joystick1), true);
 
         //Other Controls
         buttons[0].resetRobot = InputControl.setKey("1: Reset Robot", PlayerOneIndex, KeyCode.R, new JoystickInput(JoystickButton.Button8, Joystick.Joystick1), true);
@@ -608,6 +677,9 @@ public static void TankControls()
         axes[0].pwm4Axes = InputControl.setAxis("1: PWM 4 Axis 6", PlayerOneIndex, buttons[0].pwm4Neg, buttons[0].pwm4Plus, true);
         axes[0].pwm5Axes = InputControl.setAxis("1: PWM 5 Axis 7", PlayerOneIndex, buttons[0].pwm5Neg, buttons[0].pwm5Plus, true);
         axes[0].pwm6Axes = InputControl.setAxis("1: PWM 6 Axis 8", PlayerOneIndex, buttons[0].pwm6Neg, buttons[0].pwm6Plus, true);
+        axes[0].pwm7Axes = InputControl.setAxis("1: PWM 7 Axis 9", PlayerOneIndex, buttons[0].pwm7Neg, buttons[0].pwm7Plus, true);
+        axes[0].pwm8Axes = InputControl.setAxis("1: PWM 8 Axis 10", PlayerOneIndex, buttons[0].pwm8Neg, buttons[0].pwm8Plus, true);
+        axes[0].pwm9Axes = InputControl.setAxis("1: PWM 9 Axis 11", PlayerOneIndex, buttons[0].pwm9Neg, buttons[0].pwm9Plus, true);
         #endregion
 
         #region Player 2 Controls
@@ -628,6 +700,12 @@ public static void TankControls()
         buttons[1].pwm5Neg = InputControl.setKey("2: PWM 5 Negative", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis7Negative, Joystick.Joystick2), true);
         buttons[1].pwm6Plus = InputControl.setKey("2: PWM 6 Positive", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis8Positive, Joystick.Joystick2), true);
         buttons[1].pwm6Neg = InputControl.setKey("2: PWM 6 Negative", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis8Negative, Joystick.Joystick2), true);
+        buttons[1].pwm7Plus = InputControl.setKey("2: PWM 7 Positive", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis9Positive, Joystick.Joystick2), true);
+        buttons[1].pwm7Neg = InputControl.setKey("2: PWM 7 Negative", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis9Negative, Joystick.Joystick2), true);
+        buttons[1].pwm8Plus = InputControl.setKey("2: PWM 8 Positive", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis10Positive, Joystick.Joystick2), true);
+        buttons[1].pwm8Neg = InputControl.setKey("2: PWM 8 Negative", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis10Negative, Joystick.Joystick2), true);
+        buttons[1].pwm9Plus = InputControl.setKey("2: PWM 9 Positive", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis11Positive, Joystick.Joystick2), true);
+        buttons[1].pwm9Neg = InputControl.setKey("2: PWM 9 Negative", PlayerTwoIndex, new JoystickInput(JoystickAxis.Axis11Negative, Joystick.Joystick2), true);
 
         //Other Controls
         buttons[1].resetRobot = InputControl.setKey("2: Reset Robot", PlayerTwoIndex, new JoystickInput(JoystickButton.Button8, Joystick.Joystick2), true);
@@ -650,6 +728,9 @@ public static void TankControls()
         axes[1].pwm4Axes = InputControl.setAxis("2: PWM 4 Axis 6", PlayerOneIndex, buttons[1].pwm4Neg, buttons[1].pwm4Plus, true);
         axes[1].pwm5Axes = InputControl.setAxis("2: PWM 5 Axis 7", PlayerOneIndex, buttons[1].pwm5Neg, buttons[1].pwm5Plus, true);
         axes[1].pwm6Axes = InputControl.setAxis("2: PWM 6 Axis 8", PlayerOneIndex, buttons[1].pwm6Neg, buttons[1].pwm6Plus, true);
+        axes[1].pwm7Axes = InputControl.setAxis("2: PWM 7 Axis 9", PlayerOneIndex, buttons[1].pwm7Neg, buttons[1].pwm7Plus, true);
+        axes[1].pwm8Axes = InputControl.setAxis("2: PWM 8 Axis 10", PlayerOneIndex, buttons[1].pwm8Neg, buttons[1].pwm8Plus, true);
+        axes[1].pwm9Axes = InputControl.setAxis("2: PWM 9 Axis 11", PlayerOneIndex, buttons[1].pwm9Neg, buttons[1].pwm9Plus, true);
         #endregion
 
         #region Player 3 Controls
@@ -670,6 +751,12 @@ public static void TankControls()
         buttons[2].pwm5Neg = InputControl.setKey("3: PWM 5 Negative", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis7Negative, Joystick.Joystick3), true);
         buttons[2].pwm6Plus = InputControl.setKey("3: PWM 6 Positive", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis8Positive, Joystick.Joystick3), true);
         buttons[2].pwm6Neg = InputControl.setKey("3: PWM 6 Negative", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis8Negative, Joystick.Joystick3), true);
+        buttons[2].pwm7Plus = InputControl.setKey("3: PWM 7 Positive", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis9Positive, Joystick.Joystick3), true);
+        buttons[2].pwm7Neg = InputControl.setKey("3: PWM 7 Negative", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis9Negative, Joystick.Joystick3), true);
+        buttons[2].pwm8Plus = InputControl.setKey("3: PWM 8 Positive", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis10Positive, Joystick.Joystick3), true);
+        buttons[2].pwm8Neg = InputControl.setKey("3: PWM 8 Negative", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis10Negative, Joystick.Joystick3), true);
+        buttons[2].pwm9Plus = InputControl.setKey("3: PWM 9 Positive", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis11Positive, Joystick.Joystick3), true);
+        buttons[2].pwm9Neg = InputControl.setKey("3: PWM 9 Negative", PlayerThreeIndex, new JoystickInput(JoystickAxis.Axis11Negative, Joystick.Joystick3), true);
 
         //Other Controls
         buttons[2].resetRobot = InputControl.setKey("3: Reset Robot", PlayerThreeIndex, new JoystickInput(JoystickButton.Button8, Joystick.Joystick3), true);
@@ -692,6 +779,9 @@ public static void TankControls()
         axes[2].pwm4Axes = InputControl.setAxis("3: PWM 4 Axis 6", PlayerOneIndex, buttons[2].pwm4Neg, buttons[2].pwm4Plus, true);
         axes[2].pwm5Axes = InputControl.setAxis("3: PWM 5 Axis 7", PlayerOneIndex, buttons[2].pwm5Neg, buttons[2].pwm5Plus, true);
         axes[2].pwm6Axes = InputControl.setAxis("3: PWM 6 Axis 8", PlayerOneIndex, buttons[2].pwm6Neg, buttons[2].pwm6Plus, true);
+        axes[2].pwm7Axes = InputControl.setAxis("3: PWM 7 Axis 9", PlayerOneIndex, buttons[2].pwm7Neg, buttons[2].pwm7Plus, true);
+        axes[2].pwm8Axes = InputControl.setAxis("3: PWM 8 Axis 10", PlayerOneIndex, buttons[2].pwm8Neg, buttons[2].pwm8Plus, true);
+        axes[2].pwm9Axes = InputControl.setAxis("3: PWM 9 Axis 11", PlayerOneIndex, buttons[2].pwm9Neg, buttons[2].pwm9Plus, true);
         #endregion
 
         #region Player 4 Controls
@@ -712,6 +802,12 @@ public static void TankControls()
         buttons[3].pwm5Neg = InputControl.setKey("4: PWM 5 Negative", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis7Negative, Joystick.Joystick4), true);
         buttons[3].pwm6Plus = InputControl.setKey("4: PWM 6 Positive", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis8Positive, Joystick.Joystick4), true);
         buttons[3].pwm6Neg = InputControl.setKey("4: PWM 6 Negative", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis8Negative, Joystick.Joystick4), true);
+        buttons[3].pwm7Plus = InputControl.setKey("4: PWM 7 Positive", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis9Positive, Joystick.Joystick4), true);
+        buttons[3].pwm7Neg = InputControl.setKey("4: PWM 7 Negative", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis9Negative, Joystick.Joystick4), true);
+        buttons[3].pwm8Plus = InputControl.setKey("4: PWM 8 Positive", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis10Positive, Joystick.Joystick4), true);
+        buttons[3].pwm8Neg = InputControl.setKey("4: PWM 8 Negative", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis10Negative, Joystick.Joystick4), true);
+        buttons[3].pwm9Plus = InputControl.setKey("4: PWM 9 Positive", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis11Positive, Joystick.Joystick4), true);
+        buttons[3].pwm9Neg = InputControl.setKey("4: PWM 9 Negative", PlayerFourIndex, new JoystickInput(JoystickAxis.Axis11Negative, Joystick.Joystick4), true);
 
         //Other Controls
         buttons[3].resetRobot = InputControl.setKey("4: Reset Robot", PlayerFourIndex, new JoystickInput(JoystickButton.Button8, Joystick.Joystick4), true);
@@ -734,6 +830,9 @@ public static void TankControls()
         axes[3].pwm4Axes = InputControl.setAxis("4: PWM 4 Axis 6", PlayerOneIndex, buttons[3].pwm4Neg, buttons[3].pwm4Plus, true);
         axes[3].pwm5Axes = InputControl.setAxis("4: PWM 5 Axis 7", PlayerOneIndex, buttons[3].pwm5Neg, buttons[3].pwm5Plus, true);
         axes[3].pwm6Axes = InputControl.setAxis("4: PWM 6 Axis 8", PlayerOneIndex, buttons[3].pwm6Neg, buttons[3].pwm6Plus, true);
+        axes[3].pwm7Axes = InputControl.setAxis("4: PWM 7 Axis 9", PlayerOneIndex, buttons[3].pwm7Neg, buttons[3].pwm7Plus, true);
+        axes[3].pwm8Axes = InputControl.setAxis("4: PWM 8 Axis 10", PlayerOneIndex, buttons[3].pwm8Neg, buttons[3].pwm8Plus, true);
+        axes[3].pwm9Axes = InputControl.setAxis("4: PWM 9 Axis 11", PlayerOneIndex, buttons[3].pwm9Neg, buttons[3].pwm9Plus, true);
         #endregion
 
         #region Player 5 Controls
@@ -754,6 +853,12 @@ public static void TankControls()
         buttons[4].pwm5Neg = InputControl.setKey("5: PWM 5 Negative", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis7Negative, Joystick.Joystick5), true);
         buttons[4].pwm6Plus = InputControl.setKey("5: PWM 6 Positive", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis8Positive, Joystick.Joystick5), true);
         buttons[4].pwm6Neg = InputControl.setKey("5: PWM 6 Negative", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis8Negative, Joystick.Joystick5), true);
+        buttons[4].pwm7Plus = InputControl.setKey("5: PWM 7 Positive", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis9Positive, Joystick.Joystick5), true);
+        buttons[4].pwm7Neg = InputControl.setKey("5: PWM 7 Negative", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis9Negative, Joystick.Joystick5), true);
+        buttons[4].pwm8Plus = InputControl.setKey("5: PWM 8 Positive", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis10Positive, Joystick.Joystick5), true);
+        buttons[4].pwm8Neg = InputControl.setKey("5: PWM 8 Negative", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis10Negative, Joystick.Joystick5), true);
+        buttons[4].pwm9Plus = InputControl.setKey("5: PWM 9 Positive", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis11Positive, Joystick.Joystick5), true);
+        buttons[4].pwm9Neg = InputControl.setKey("5: PWM 9 Negative", PlayerFiveIndex, new JoystickInput(JoystickAxis.Axis11Negative, Joystick.Joystick5), true);
 
         //Other Controls
         buttons[4].resetRobot = InputControl.setKey("5: Reset Robot", PlayerFiveIndex, new JoystickInput(JoystickButton.Button8, Joystick.Joystick5), true);
@@ -776,6 +881,9 @@ public static void TankControls()
         axes[4].pwm4Axes = InputControl.setAxis("5: PWM 4 Axis 6", PlayerOneIndex, buttons[4].pwm4Neg, buttons[4].pwm4Plus, true);
         axes[4].pwm5Axes = InputControl.setAxis("5: PWM 5 Axis 7", PlayerOneIndex, buttons[4].pwm5Neg, buttons[4].pwm5Plus, true);
         axes[4].pwm6Axes = InputControl.setAxis("5: PWM 6 Axis 8", PlayerOneIndex, buttons[4].pwm6Neg, buttons[4].pwm6Plus, true);
+        axes[4].pwm7Axes = InputControl.setAxis("5: PWM 7 Axis 9", PlayerOneIndex, buttons[4].pwm7Neg, buttons[4].pwm7Plus, true);
+        axes[4].pwm8Axes = InputControl.setAxis("5: PWM 8 Axis 10", PlayerOneIndex, buttons[4].pwm8Neg, buttons[4].pwm8Plus, true);
+        axes[4].pwm9Axes = InputControl.setAxis("5: PWM 9 Axis 11", PlayerOneIndex, buttons[4].pwm9Neg, buttons[4].pwm9Plus, true);
         #endregion
 
         #region Player 6 Controls
@@ -796,6 +904,12 @@ public static void TankControls()
         buttons[5].pwm5Neg = InputControl.setKey("6: PWM 5 Negative", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis7Negative, Joystick.Joystick6), true);
         buttons[5].pwm6Plus = InputControl.setKey("6: PWM 6 Positive", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis8Positive, Joystick.Joystick6), true);
         buttons[5].pwm6Neg = InputControl.setKey("6: PWM 6 Negative", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis8Negative, Joystick.Joystick6), true);
+        buttons[5].pwm7Plus = InputControl.setKey("6: PWM 7 Positive", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis9Positive, Joystick.Joystick6), true);
+        buttons[5].pwm7Neg = InputControl.setKey("6: PWM 7 Negative", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis9Negative, Joystick.Joystick6), true);
+        buttons[5].pwm8Plus = InputControl.setKey("6: PWM 8 Positive", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis10Positive, Joystick.Joystick6), true);
+        buttons[5].pwm8Neg = InputControl.setKey("6: PWM 8 Negative", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis10Negative, Joystick.Joystick6), true);
+        buttons[5].pwm9Plus = InputControl.setKey("6: PWM 9 Positive", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis11Positive, Joystick.Joystick6), true);
+        buttons[5].pwm9Neg = InputControl.setKey("6: PWM 9 Negative", PlayerSixIndex, new JoystickInput(JoystickAxis.Axis11Negative, Joystick.Joystick6), true);
 
         //Other Controls
         buttons[5].resetRobot = InputControl.setKey("6: Reset Robot", PlayerSixIndex, new JoystickInput(JoystickButton.Button8, Joystick.Joystick6), true);
@@ -818,6 +932,9 @@ public static void TankControls()
         axes[5].pwm4Axes = InputControl.setAxis("6: PWM 4 Axis 6", PlayerOneIndex, buttons[5].pwm4Neg, buttons[5].pwm4Plus, true);
         axes[5].pwm5Axes = InputControl.setAxis("6: PWM 5 Axis 7", PlayerOneIndex, buttons[5].pwm5Neg, buttons[5].pwm5Plus, true);
         axes[5].pwm6Axes = InputControl.setAxis("6: PWM 6 Axis 8", PlayerOneIndex, buttons[5].pwm6Neg, buttons[5].pwm6Plus, true);
+        axes[5].pwm7Axes = InputControl.setAxis("6: PWM 7 Axis 9", PlayerOneIndex, buttons[5].pwm7Neg, buttons[5].pwm7Plus, true);
+        axes[5].pwm8Axes = InputControl.setAxis("6: PWM 8 Axis 10", PlayerOneIndex, buttons[5].pwm8Neg, buttons[5].pwm8Plus, true);
+        axes[5].pwm9Axes = InputControl.setAxis("6: PWM 9 Axis 11", PlayerOneIndex, buttons[5].pwm9Neg, buttons[5].pwm9Plus, true);
         #endregion
     }
 }
diff --git a/engine/unity5/ProjectSettings/ProjectSettings.asset b/engine/unity5/ProjectSettings/ProjectSettings.asset
index bcb04b7ae3..b5ab76f920 100644
--- a/engine/unity5/ProjectSettings/ProjectSettings.asset
+++ b/engine/unity5/ProjectSettings/ProjectSettings.asset
@@ -3,9 +3,10 @@
 --- !u!129 &1
 PlayerSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 11
+  serializedVersion: 14
   productGUID: 37e8bba9372f39d4d84c4ea4ee0b7e4f
   AndroidProfiler: 0
+  AndroidFilterTouchesWhenObscured: 0
   defaultScreenOrientation: 4
   targetDevice: 2
   useOnDemandResources: 0
@@ -14,7 +15,7 @@ PlayerSettings:
   productName: Synthesis
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
-  m_SplashScreenBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21176471, a: 1}
+  m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
   m_ShowUnitySplashScreen: 1
   m_ShowUnitySplashLogo: 1
   m_SplashScreenOverlayOpacity: 1
@@ -38,8 +39,6 @@ PlayerSettings:
     width: 1
     height: 1
   m_SplashScreenLogos: []
-  m_SplashScreenBackgroundLandscape: {fileID: 0}
-  m_SplashScreenBackgroundPortrait: {fileID: 0}
   m_VirtualRealitySplashScreen: {fileID: 0}
   m_HolographicTrackingLossScreen: {fileID: 0}
   defaultScreenWidth: 1024
@@ -49,7 +48,6 @@ PlayerSettings:
   m_StereoRenderingPath: 0
   m_ActiveColorSpace: 0
   m_MTRendering: 1
-  m_MobileMTRendering: 0
   m_StackTraceTypes: 010000000100000001000000010000000100000001000000
   iosShowActivityIndicatorOnLoading: -1
   androidShowActivityIndicatorOnLoading: -1
@@ -63,13 +61,19 @@ PlayerSettings:
   allowedAutorotateToLandscapeLeft: 1
   useOSAutorotation: 1
   use32BitDisplayBuffer: 1
+  preserveFramebufferAlpha: 0
   disableDepthAndStencilBuffers: 0
+  androidBlitType: 0
   defaultIsFullScreen: 0
   defaultIsNativeResolution: 1
+  macRetinaSupport: 1
   runInBackground: 0
   captureSingleScreen: 0
   muteOtherAudioSources: 0
   Prepare IOS For Recording: 0
+  Force IOS Speakers When Recording: 0
+  deferSystemGesturesMode: 0
+  hideHomeButton: 0
   submitAnalytics: 1
   usePlayerLog: 1
   bakeCollisionMeshes: 0
@@ -88,19 +92,22 @@ PlayerSettings:
   allowFullscreenSwitch: 1
   graphicsJobMode: 0
   macFullscreenMode: 2
-  d3d9FullscreenMode: 1
   d3d11FullscreenMode: 1
   xboxSpeechDB: 0
   xboxEnableHeadOrientation: 0
   xboxEnableGuest: 0
   xboxEnablePIXSampling: 0
+  metalFramebufferOnly: 0
   n3dsDisableStereoscopicView: 0
   n3dsEnableSharedListOpt: 1
   n3dsEnableVSync: 0
-  ignoreAlphaClear: 0
   xboxOneResolution: 0
+  xboxOneSResolution: 0
+  xboxOneXResolution: 3
   xboxOneMonoLoggingLevel: 0
   xboxOneLoggingLevel: 1
+  xboxOneDisableEsram: 0
+  xboxOnePresentImmediateThreshold: 0
   videoMemoryForVertexBuffers: 0
   psp2PowerMode: 0
   psp2AcquireBGM: 1
@@ -122,6 +129,7 @@ PlayerSettings:
   bundleVersion: 1.0
   preloadedAssets: []
   metroInputSource: 0
+  wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 0
   xboxOneEnable7thCore: 0
@@ -132,10 +140,23 @@ PlayerSettings:
     daydream:
       depthFormat: 0
       useSustainedPerformanceMode: 0
+      enableVideoLayer: 0
+      useProtectedVideoMemory: 0
+      minimumSupportedHeadTracking: 0
+      maximumSupportedHeadTracking: 1
     hololens:
       depthFormat: 1
+      depthBufferSharingEnabled: 0
+    oculus:
+      sharedDepthBuffer: 0
+      dashSupport: 0
   protectGraphicsMemory: 0
   useHDRDisplay: 0
+  m_ColorGamuts: 00000000
+  targetPixelDensity: 30
+  resolutionScalingMode: 0
+  androidSupportedAspectRatio: 1
+  androidMaxAspectRatio: 2.1
   applicationIdentifier: {}
   buildNumber: {}
   AndroidBundleVersionCode: 1
@@ -156,10 +177,10 @@ PlayerSettings:
     serializedVersion: 2
     m_Bits: 238
   iPhoneSdkVersion: 988
-  iOSTargetOSVersionString: 
+  iOSTargetOSVersionString: 7.0
   tvOSSdkVersion: 0
   tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 
+  tvOSTargetOSVersionString: 9.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
@@ -172,15 +193,22 @@ PlayerSettings:
   iPhone47inSplashScreen: {fileID: 0}
   iPhone55inPortraitSplashScreen: {fileID: 0}
   iPhone55inLandscapeSplashScreen: {fileID: 0}
+  iPhone58inPortraitSplashScreen: {fileID: 0}
+  iPhone58inLandscapeSplashScreen: {fileID: 0}
   iPadPortraitSplashScreen: {fileID: 0}
   iPadHighResPortraitSplashScreen: {fileID: 0}
   iPadLandscapeSplashScreen: {fileID: 0}
   iPadHighResLandscapeSplashScreen: {fileID: 0}
   appleTVSplashScreen: {fileID: 0}
+  appleTVSplashScreen2x: {fileID: 0}
   tvOSSmallIconLayers: []
+  tvOSSmallIconLayers2x: []
   tvOSLargeIconLayers: []
+  tvOSLargeIconLayers2x: []
   tvOSTopShelfImageLayers: []
+  tvOSTopShelfImageLayers2x: []
   tvOSTopShelfImageWideLayers: []
+  tvOSTopShelfImageWideLayers2x: []
   iOSLaunchScreenType: 0
   iOSLaunchScreenPortrait: {fileID: 0}
   iOSLaunchScreenLandscape: {fileID: 0}
@@ -198,6 +226,8 @@ PlayerSettings:
   iOSLaunchScreeniPadFillPct: 100
   iOSLaunchScreeniPadSize: 100
   iOSLaunchScreeniPadCustomXibPath: 
+  iOSUseLaunchScreenStoryboard: 0
+  iOSLaunchScreenCustomStoryboardPath: 
   iOSDeviceRequirements: []
   iOSURLSchemes: []
   iOSBackgroundModes: 0
@@ -209,6 +239,7 @@ PlayerSettings:
   iOSManualSigningProvisioningProfileID: 
   tvOSManualSigningProvisioningProfileID: 
   appleEnableAutomaticSigning: 0
+  clonedFromGUID: 00000000000000000000000000000000
   AndroidTargetDevice: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
@@ -216,7 +247,9 @@ PlayerSettings:
   AndroidKeyaliasName: 
   AndroidTVCompatibility: 1
   AndroidIsGame: 1
+  AndroidEnableTango: 0
   androidEnableBanner: 1
+  androidUseLowAccuracyLocation: 0
   m_AndroidBanners:
   - width: 320
     height: 180
@@ -227,10 +260,20 @@ PlayerSettings:
   m_BuildTargetBatching: []
   m_BuildTargetGraphicsAPIs: []
   m_BuildTargetVRSettings: []
+  m_BuildTargetEnableVuforiaSettings: []
   openGLRequireES31: 0
   openGLRequireES31AEP: 0
-  webPlayerTemplate: APPLICATION:Default
   m_TemplateCustomTags: {}
+  mobileMTRendering:
+    iPhone: 1
+    tvOS: 1
+  m_BuildTargetGroupLightmapEncodingQuality:
+  - m_BuildTarget: Standalone
+    m_EncodingQuality: 1
+  - m_BuildTarget: XboxOne
+    m_EncodingQuality: 1
+  - m_BuildTarget: PS4
+    m_EncodingQuality: 1
   wiiUTitleID: 0005000011000000
   wiiUGroupID: 00010000
   wiiUCommonSaveSize: 4096
@@ -277,6 +320,9 @@ PlayerSettings:
   switchTitleNames_9: 
   switchTitleNames_10: 
   switchTitleNames_11: 
+  switchTitleNames_12: 
+  switchTitleNames_13: 
+  switchTitleNames_14: 
   switchPublisherNames_0: 
   switchPublisherNames_1: 
   switchPublisherNames_2: 
@@ -289,6 +335,9 @@ PlayerSettings:
   switchPublisherNames_9: 
   switchPublisherNames_10: 
   switchPublisherNames_11: 
+  switchPublisherNames_12: 
+  switchPublisherNames_13: 
+  switchPublisherNames_14: 
   switchIcons_0: {fileID: 0}
   switchIcons_1: {fileID: 0}
   switchIcons_2: {fileID: 0}
@@ -301,6 +350,9 @@ PlayerSettings:
   switchIcons_9: {fileID: 0}
   switchIcons_10: {fileID: 0}
   switchIcons_11: {fileID: 0}
+  switchIcons_12: {fileID: 0}
+  switchIcons_13: {fileID: 0}
+  switchIcons_14: {fileID: 0}
   switchSmallIcons_0: {fileID: 0}
   switchSmallIcons_1: {fileID: 0}
   switchSmallIcons_2: {fileID: 0}
@@ -313,6 +365,9 @@ PlayerSettings:
   switchSmallIcons_9: {fileID: 0}
   switchSmallIcons_10: {fileID: 0}
   switchSmallIcons_11: {fileID: 0}
+  switchSmallIcons_12: {fileID: 0}
+  switchSmallIcons_13: {fileID: 0}
+  switchSmallIcons_14: {fileID: 0}
   switchManualHTML: 
   switchAccessibleURLs: 
   switchLegalInformation: 
@@ -354,6 +409,8 @@ PlayerSettings:
   switchLocalCommunicationIds_7: 
   switchParentalControl: 0
   switchAllowsScreenshot: 1
+  switchAllowsVideoCapturing: 1
+  switchAllowsRuntimeAddOnContentInstall: 0
   switchDataLossConfirmation: 0
   switchSupportedNpadStyles: 3
   switchSocketConfigEnabled: 0
@@ -385,6 +442,8 @@ PlayerSettings:
   ps4PronunciationSIGPath: 
   ps4BackgroundImagePath: 
   ps4StartupImagePath: 
+  ps4StartupImagesFolder: 
+  ps4IconImagesFolder: 
   ps4SaveDataImagePath: 
   ps4SdkOverride: 
   ps4BGMPath: 
@@ -404,7 +463,6 @@ PlayerSettings:
   ps4GarlicHeapSize: 2048
   ps4ProGarlicHeapSize: 2560
   ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
-  ps4UseDebugIl2cppLibs: 0
   ps4pnSessions: 1
   ps4pnPresence: 1
   ps4pnFriends: 1
@@ -479,7 +537,7 @@ PlayerSettings:
   psp2UseLibLocation: 0
   psp2InfoBarOnStartup: 0
   psp2InfoBarColor: 0
-  psp2UseDebugIl2cppLibs: 0
+  psp2ScriptOptimizationLevel: 0
   psmSplashimage: {fileID: 0}
   splashScreenBackgroundSourceLandscape: {fileID: 0}
   splashScreenBackgroundSourcePortrait: {fileID: 0}
@@ -501,6 +559,7 @@ PlayerSettings:
   scriptingBackend: {}
   incrementalIl2cppBuild: {}
   additionalIl2CppArgs: 
+  scriptingRuntimeVersion: 0
   apiCompatibilityLevelPerPlatform: {}
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
@@ -549,12 +608,6 @@ PlayerSettings:
   n3dsTitle: GameName
   n3dsProductCode: 
   n3dsApplicationId: 0xFF3FF
-  stvDeviceAddress: 
-  stvProductDescription: 
-  stvProductAuthor: 
-  stvProductAuthorEmail: 
-  stvProductLink: 
-  stvProductCategory: 0
   XboxOneProductId: 
   XboxOneUpdateKey: 
   XboxOneSandboxId: 
@@ -585,8 +638,9 @@ PlayerSettings:
   cloudServicesEnabled: {}
   facebookSdkVersion: 7.9.1
   apiCompatibilityLevel: 2
-  cloudProjectId: 
-  projectName: 
-  organizationId: 
+  cloudProjectId: 528d1077-8c4a-431f-aa7d-d924866221ce
+  projectName: BXD Synthesis
+  organizationId: isabellemcordova
   cloudEnabled: 0
-  enableNewInputSystem: 0
+  enableNativePlatformBackendsForNewInputSystem: 0
+  disableOldInputManagerSupport: 0
diff --git a/engine/unity5/UnityPackageManager/manifest.json b/engine/unity5/UnityPackageManager/manifest.json
new file mode 100644
index 0000000000..526aca6057
--- /dev/null
+++ b/engine/unity5/UnityPackageManager/manifest.json
@@ -0,0 +1,4 @@
+{
+	"dependencies": {
+	}
+}