diff --git a/Doc/DevelopmentPlan/GanttChart.gan b/Doc/DevelopmentPlan/GanttChart.gan
index 35c980717c18d43d728196f7fa1b05ca16e87a79..30775685c9cfe9be78333897f318d4a4f3f510d9 100644
--- a/Doc/DevelopmentPlan/GanttChart.gan
+++ b/Doc/DevelopmentPlan/GanttChart.gan
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><project name="BlazeBrigadeGanttChart" company="007 (Team 7)" webLink="http://" view-date="2016-09-18" view-index="1" gantt-divider-location="365" resource-divider-location="300" version="2.8.1" locale="en_US">
+<?xml version="1.0" encoding="UTF-8"?><project name="BlazeBrigadeGanttChart" company="007 (Team 7)" webLink="http://" view-date="2016-07-31" view-index="0" gantt-divider-location="494" resource-divider-location="300" version="2.8.1" locale="en_US">
     <description/>
     <view zooming-state="default:7" id="gantt-chart">
-        <field id="tpd3" name="Name" width="176" order="0"/>
-        <field id="tpd4" name="Begin date" width="96" order="1"/>
-        <field id="tpd5" name="End date" width="87" order="2"/>
+        <field id="tpd3" name="Name" width="219" order="0"/>
+        <field id="tpd4" name="Begin date" width="139" order="1"/>
+        <field id="tpd5" name="End date" width="130" order="2"/>
     </view>
     <view id="resource-table">
         <field id="0" name="Name" width="205" order="0"/>
@@ -35,6 +35,7 @@
         </taskproperties>
         <task id="0" name="Problem Statement" color="#8cb6ce" meeting="false" start="2016-09-20" duration="4" complete="100" expand="true">
             <depend id="3" type="2" difference="0" hardness="Strong"/>
+            <depend id="238" type="2" difference="0" hardness="Strong"/>
         </task>
         <task id="3" name="Development Plan" color="#8cb6ce" meeting="false" start="2016-09-26" duration="6" complete="0" expand="true">
             <depend id="4" type="2" difference="0" hardness="Strong"/>
@@ -42,13 +43,21 @@
         <task id="4" name="Requirements Document - Revision 0" color="#8cb6ce" meeting="false" start="2016-10-04" duration="6" complete="0" expand="true">
             <depend id="28" type="2" difference="0" hardness="Strong"/>
         </task>
-        <task id="28" name="Proof of Concepts" color="#8cb6ce" meeting="false" start="2016-10-12" duration="8" complete="0" expand="true">
-            <task id="33" name="PoC Implementation" meeting="false" start="2016-10-12" duration="5" complete="0" expand="true"/>
-            <task id="34" name="PoC Demonstation" meeting="false" start="2016-10-19" duration="3" complete="0" expand="true"/>
+        <task id="28" name="Proof of Concepts" color="#8cb6ce" meeting="false" start="2016-10-12" duration="8" complete="0" expand="false">
+            <task id="33" name="PoC Implementation" color="#8cb6ce" meeting="false" start="2016-10-12" duration="5" complete="0" expand="true"/>
+            <task id="34" name="PoC Demonstation" color="#8cb6ce" meeting="false" start="2016-10-19" duration="3" complete="0" expand="true"/>
         </task>
         <task id="8" name="Test Plan - Revision 0" color="#8cb6ce" meeting="false" start="2016-10-21" duration="7" complete="0" expand="true"/>
-        <task id="9" name="Design Document - Revision 0" color="#8cb6ce" meeting="false" start="2016-10-26" duration="13" complete="0" expand="true"/>
-        <task id="17" name="Development of Blaze Brigade" color="#8cb6ce" meeting="false" start="2016-10-26" duration="18" complete="0" expand="true">
+        <task id="9" name="Design Document - Revision 0" color="#8cb6ce" meeting="false" start="2016-10-26" duration="13" complete="0" expand="false">
+            <task id="131" name="Module Interface Spec" color="#8cb6ce" meeting="false" start="2016-10-26" duration="13" complete="0" expand="true"/>
+            <task id="132" name="Module Guide" color="#8cb6ce" meeting="false" start="2016-10-26" duration="13" complete="0" expand="true"/>
+        </task>
+        <task id="133" name="Module Development" color="#8cb6ce" meeting="false" start="2016-11-14" duration="5" complete="0" expand="false">
+            <task id="145" name="M4: Menu Module" color="#8cb6ce" meeting="false" start="2016-11-14" duration="5" complete="0" expand="true"/>
+            <task id="144" name="M5: Model Module" color="#8cb6ce" meeting="false" start="2016-11-14" duration="5" complete="0" expand="true"/>
+            <task id="146" name="M6: GUI Module" color="#8cb6ce" meeting="false" start="2016-11-14" duration="5" complete="0" expand="true"/>
+        </task>
+        <task id="17" name="Development of Blaze Brigade" color="#8cb6ce" meeting="false" start="2016-10-26" duration="18" complete="0" expand="false">
             <notes><![CDATA[-This will be broken down into several smaller tasks once we're certain on what needs to be accomplished]]></notes>
             <depend id="18" type="2" difference="0" hardness="Strong"/>
             <task id="65" name="Sprint 1 Implementation" meeting="false" start="2016-10-26" duration="4" complete="0" expand="false">
@@ -60,6 +69,8 @@
             </task>
             <task id="60" name="Sprint 1 Unit Testing" color="#8cb6ce" meeting="false" start="2016-10-26" duration="4" complete="0" expand="true">
                 <depend id="88" type="2" difference="0" hardness="Strong"/>
+                <task id="253" name="Unit Test: Unit Movement" meeting="false" start="2016-10-26" duration="4" complete="0" expand="true"/>
+                <task id="254" name="Unit Test: Unit State" meeting="false" start="2016-10-26" duration="4" complete="0" expand="true"/>
             </task>
             <task id="93" name="Sprint 2 Implementation" color="#8cb6ce" meeting="false" start="2016-11-01" duration="9" complete="0" expand="false">
                 <depend id="108" type="2" difference="0" hardness="Strong"/>
@@ -70,18 +81,48 @@
             </task>
             <task id="88" name="Sprint 2 Unit Testing" color="#8cb6ce" meeting="false" start="2016-11-01" duration="9" complete="0" expand="true">
                 <depend id="98" type="2" difference="0" hardness="Strong"/>
+                <task id="255" name="Unit Test: Combat" meeting="false" start="2016-11-01" duration="9" complete="0" expand="true"/>
+                <task id="256" name="Unit Test: Additional Unit" meeting="false" start="2016-11-01" duration="9" complete="0" expand="true"/>
             </task>
             <task id="108" name="Sprint 3 Implementation" color="#000000" meeting="false" start="2016-11-14" duration="5" complete="0" expand="false">
                 <task id="109" name="Add Obstacles" meeting="false" start="2016-11-14" duration="5" complete="0" expand="true"/>
                 <task id="110" name="Add Full Army" meeting="false" start="2016-11-14" duration="5" complete="0" expand="true"/>
             </task>
-            <task id="98" name="Sprint 3 Unit Testing" color="#8cb6ce" meeting="false" start="2016-11-14" duration="5" complete="0" expand="true"/>
+            <task id="98" name="Sprint 3 Unit Testing" color="#8cb6ce" meeting="false" start="2016-11-14" duration="5" complete="0" expand="true">
+                <task id="257" name="Unit Test: Obstacles" meeting="false" start="2016-11-14" duration="5" complete="0" expand="true"/>
+                <task id="258" name="Unit Test: Full Army State" meeting="false" start="2016-11-14" duration="5" complete="0" expand="true"/>
+            </task>
+        </task>
+        <task id="18" name="Testing of Blaze Brigade" color="#8cb6ce" meeting="false" start="2016-11-21" duration="8" complete="0" expand="false">
+            <task id="232" name="Structural Testing" color="#000000" meeting="false" start="2016-11-21" duration="3" complete="0" expand="true">
+                <task id="233" name="Check: Structure of Code" meeting="false" start="2016-11-21" duration="3" complete="0" expand="true"/>
+                <task id="234" name="Check: Correct design behaviour" meeting="false" start="2016-11-21" duration="3" complete="0" expand="true"/>
+            </task>
+            <task id="235" name="Static Testing" color="#000000" meeting="false" start="2016-11-21" duration="3" complete="0" expand="false">
+                <task id="236" name="Check and Document: Code Inspections" meeting="false" start="2016-11-21" duration="3" complete="0" expand="true"/>
+                <task id="237" name="Check and Document: Proof for Correctness" color="#8cb6ce" meeting="false" start="2016-11-21" duration="3" complete="0" expand="true"/>
+            </task>
+            <task id="238" name="Integration Testing" color="#000000" meeting="false" start="2016-11-23" duration="2" complete="0" expand="true">
+                <task id="239" name="Testing of Modules" meeting="false" start="2016-11-23" duration="2" complete="0" expand="true"/>
+            </task>
+            <task id="176" name="System Testing" color="#8cb6ce" meeting="false" start="2016-11-24" duration="3" complete="0" expand="true">
+                <task id="177" name="Check: Manual system walkthrough" color="#8cb6ce" meeting="false" start="2016-11-24" duration="3" complete="0" expand="true"/>
+                <task id="178" name="Check: Automated system walkthrough" color="#8cb6ce" meeting="false" start="2016-11-24" duration="3" complete="0" expand="true"/>
+                <task id="179" name="Check: Game's stress testing" color="#8cb6ce" meeting="false" start="2016-11-24" duration="3" complete="0" expand="true"/>
+            </task>
+            <task id="180" name="User Acceptance Testin" color="#8cb6ce" meeting="false" start="2016-11-25" duration="2" complete="0" expand="true">
+                <task id="181" name="Check: User's functional requirements are valid" color="#8cb6ce" meeting="false" start="2016-11-25" duration="2" complete="0" expand="true"/>
+                <task id="182" name="Check: User's non-functional requirements are valid" color="#8cb6ce" meeting="false" start="2016-11-25" duration="2" complete="0" expand="true"/>
+            </task>
+            <task id="183" name="Release Testing" color="#8cb6ce" meeting="false" start="2016-11-29" duration="2" complete="0" expand="true">
+                <task id="184" name="Check: Installation and Setting up guide" color="#8cb6ce" meeting="false" start="2016-11-29" duration="2" complete="0" expand="true"/>
+                <task id="185" name="Check: Game functional on other computers" color="#8cb6ce" meeting="false" start="2016-11-29" duration="2" complete="0" expand="true"/>
+            </task>
         </task>
-        <task id="18" name="Additional Testing of Game" color="#8cb6ce" meeting="false" start="2016-11-21" duration="8" complete="0" expand="true"/>
         <task id="19" name="Debugging of Game" color="#8cb6ce" meeting="false" start="2016-11-21" duration="8" complete="0" expand="true"/>
         <task id="20" name="Survey Round 1" color="#8cb6ce" meeting="false" start="2016-11-22" duration="1" complete="0" expand="true"/>
         <task id="21" name="Implement Changes from Survey Feedback" color="#8cb6ce" meeting="false" start="2016-11-23" duration="3" complete="0" expand="true"/>
-        <task id="117" name="Final Revision" color="#000000" meeting="false" start="2016-11-28" duration="8" complete="0" expand="true">
+        <task id="117" name="Final Revision" color="#000000" meeting="false" start="2016-11-28" duration="8" complete="0" expand="false">
             <task id="125" name="Final Demonstation (Revision 1)" meeting="false" start="2016-11-28" duration="5" complete="0" expand="true"/>
             <task id="126" name="Final Documentation (Revision 1)" meeting="false" start="2016-11-28" duration="8" complete="0" expand="true"/>
         </task>
@@ -99,43 +140,59 @@
         <allocation task-id="8" resource-id="0" function="4" responsible="false" load="25.0"/>
         <allocation task-id="9" resource-id="0" function="4" responsible="true" load="25.0"/>
         <allocation task-id="17" resource-id="0" function="4" responsible="true" load="25.0"/>
-        <allocation task-id="18" resource-id="0" function="4" responsible="false" load="25.0"/>
         <allocation task-id="19" resource-id="0" function="4" responsible="false" load="25.0"/>
         <allocation task-id="20" resource-id="0" function="4" responsible="false" load="25.0"/>
         <allocation task-id="21" resource-id="0" function="4" responsible="true" load="25.0"/>
         <allocation task-id="117" resource-id="0" function="4" responsible="false" load="25.0"/>
+        <allocation task-id="232" resource-id="0" function="4" responsible="true" load="15.0"/>
+        <allocation task-id="235" resource-id="0" function="4" responsible="false" load="15.0"/>
+        <allocation task-id="133" resource-id="0" function="4" responsible="false" load="25.0"/>
+        <allocation task-id="33" resource-id="0" function="4" responsible="false" load="25.0"/>
+        <allocation task-id="34" resource-id="0" function="4" responsible="true" load="25.0"/>
         <allocation task-id="0" resource-id="1" function="3" responsible="true" load="33.3"/>
         <allocation task-id="3" resource-id="1" function="3" responsible="false" load="25.0"/>
         <allocation task-id="4" resource-id="1" function="3" responsible="false" load="25.0"/>
         <allocation task-id="8" resource-id="1" function="3" responsible="false" load="25.0"/>
         <allocation task-id="9" resource-id="1" function="3" responsible="false" load="25.0"/>
         <allocation task-id="17" resource-id="1" function="3" responsible="true" load="25.0"/>
-        <allocation task-id="18" resource-id="1" function="3" responsible="true" load="25.0"/>
         <allocation task-id="19" resource-id="1" function="3" responsible="false" load="25.0"/>
         <allocation task-id="20" resource-id="1" function="3" responsible="false" load="25.0"/>
         <allocation task-id="21" resource-id="1" function="3" responsible="false" load="25.0"/>
         <allocation task-id="117" resource-id="1" function="3" responsible="true" load="25.0"/>
+        <allocation task-id="232" resource-id="1" function="3" responsible="false" load="15.0"/>
+        <allocation task-id="235" resource-id="1" function="3" responsible="true" load="15.0"/>
+        <allocation task-id="133" resource-id="1" function="3" responsible="true" load="25.0"/>
+        <allocation task-id="33" resource-id="1" function="3" responsible="true" load="25.0"/>
+        <allocation task-id="34" resource-id="1" function="3" responsible="false" load="25.0"/>
         <allocation task-id="0" resource-id="2" function="2" responsible="false" load="33.3"/>
         <allocation task-id="3" resource-id="2" function="2" responsible="false" load="25.0"/>
         <allocation task-id="4" resource-id="2" function="2" responsible="true" load="25.0"/>
         <allocation task-id="8" resource-id="2" function="2" responsible="false" load="25.0"/>
         <allocation task-id="9" resource-id="2" function="2" responsible="false" load="25.0"/>
         <allocation task-id="17" resource-id="2" function="2" responsible="true" load="25.0"/>
-        <allocation task-id="18" resource-id="2" function="2" responsible="false" load="25.0"/>
         <allocation task-id="19" resource-id="2" function="2" responsible="true" load="25.0"/>
         <allocation task-id="20" resource-id="2" function="2" responsible="false" load="25.0"/>
         <allocation task-id="21" resource-id="2" function="2" responsible="false" load="25.0"/>
         <allocation task-id="117" resource-id="2" function="2" responsible="false" load="25.0"/>
+        <allocation task-id="238" resource-id="2" function="2" responsible="true" load="15.0"/>
+        <allocation task-id="133" resource-id="2" function="2" responsible="true" load="25.0"/>
+        <allocation task-id="176" resource-id="2" function="2" responsible="true" load="25.0"/>
+        <allocation task-id="33" resource-id="2" function="2" responsible="false" load="25.0"/>
+        <allocation task-id="34" resource-id="2" function="2" responsible="false" load="25.0"/>
         <allocation task-id="3" resource-id="3" function="5" responsible="false" load="25.0"/>
         <allocation task-id="4" resource-id="3" function="5" responsible="false" load="25.0"/>
         <allocation task-id="8" resource-id="3" function="5" responsible="true" load="25.0"/>
         <allocation task-id="9" resource-id="3" function="5" responsible="false" load="25.0"/>
         <allocation task-id="17" resource-id="3" function="5" responsible="true" load="25.0"/>
-        <allocation task-id="18" resource-id="3" function="5" responsible="false" load="25.0"/>
         <allocation task-id="19" resource-id="3" function="5" responsible="false" load="25.0"/>
         <allocation task-id="20" resource-id="3" function="5" responsible="true" load="25.0"/>
         <allocation task-id="21" resource-id="3" function="5" responsible="false" load="25.0"/>
         <allocation task-id="117" resource-id="3" function="5" responsible="false" load="25.0"/>
+        <allocation task-id="133" resource-id="3" function="5" responsible="false" load="25.0"/>
+        <allocation task-id="180" resource-id="3" function="5" responsible="true" load="15.0"/>
+        <allocation task-id="183" resource-id="3" function="5" responsible="true" load="15.0"/>
+        <allocation task-id="33" resource-id="3" function="5" responsible="false" load="25.0"/>
+        <allocation task-id="34" resource-id="3" function="5" responsible="false" load="25.0"/>
     </allocations>
     <vacations/>
     <previous/>
diff --git a/Doc/DevelopmentPlan/GanttChart.pdf b/Doc/DevelopmentPlan/GanttChart.pdf
index 5a4bc44ed7e38244783d057d82495dc81657b006..9b67319b687eb968ee69d348bb7c9b64b7eae8ee 100644
Binary files a/Doc/DevelopmentPlan/GanttChart.pdf and b/Doc/DevelopmentPlan/GanttChart.pdf differ