commit e61997176219a988e000ee553ebf36dbebdfa45b
Author: Kristian Knarvik <kristian.knarvik@knett.no>
Date:   Mon Apr 16 13:40:41 2018 +0200

    Merge

diff --git a/.idea/artifacts/Four_In_A_Row.xml b/.idea/artifacts/Four_In_A_Row.xml
new file mode 100644
index 0000000..f273109
--- /dev/null
+++ b/.idea/artifacts/Four_In_A_Row.xml
@@ -0,0 +1,11 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="Four-In-A-Row">
+    <output-path>$PROJECT_DIR$/out/artifacts/Four_In_A_Row</output-path>
+    <root id="archive" name="Four-In-A-Row.jar">
+      <element id="directory" name="META-INF">
+        <element id="file-copy" path="$PROJECT_DIR$/META-INF/MANIFEST.MF" />
+      </element>
+      <element id="module-output" name="Four-In-A-Row" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/junit_junit_5_0_SNAPSHOT.xml b/.idea/libraries/junit_junit_5_0_SNAPSHOT.xml
new file mode 100644
index 0000000..2eed548
--- /dev/null
+++ b/.idea/libraries/junit_junit_5_0_SNAPSHOT.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="junit:junit:5.0-SNAPSHOT" type="repository">
+    <properties maven-id="junit:junit:5.0-SNAPSHOT" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/5.0-SNAPSHOT/junit-5.0-SNAPSHOT.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..0548357
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..28ec4c4
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/Four-In-A-Row.iml" filepath="$PROJECT_DIR$/Four-In-A-Row.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..eae84e7
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1038 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ArtifactsWorkspaceSettings">
+    <artifacts-to-build>
+      <artifact name="Four-In-A-Row" />
+    </artifacts-to-build>
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="69d4eee3-654f-4f1f-a941-c4798b813245" name="Default" comment="" />
+    <ignored path="$PROJECT_DIR$/out/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="InARow.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/events/InARow.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="34">
+              <caret line="2" column="20" lean-forward="false" selection-start-line="2" selection-start-column="20" selection-end-line="2" selection-end-column="20" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="IWinCondition.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/events/IWinCondition.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="153">
+              <caret line="9" column="17" lean-forward="false" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="RandomEvent.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/events/RandomEvent.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="85">
+              <caret line="7" column="29" lean-forward="false" selection-start-line="7" selection-start-column="29" selection-end-line="7" selection-end-column="29" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Block.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/events/Block.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="136">
+              <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#288#289#0" expanded="true" />
+                <element signature="e#344#345#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="NInARowGUI.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/interfaces/NInARowGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="2652">
+              <caret line="170" column="37" lean-forward="true" selection-start-line="170" selection-start-column="37" selection-end-line="170" selection-end-column="38" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="GUI.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/interfaces/GUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="136">
+              <caret line="8" column="18" lean-forward="false" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
+              <folding>
+                <element signature="e#1588#1589#0" expanded="true" />
+                <element signature="e#1655#1656#0" expanded="true" />
+                <element signature="e#1699#1700#0" expanded="true" />
+                <element signature="e#1735#1736#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="IBoard.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/board/IBoard.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="306">
+              <caret line="21" column="24" lean-forward="true" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Grid.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/board/Grid.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1547">
+              <caret line="95" column="8" lean-forward="false" selection-start-line="95" selection-start-column="8" selection-end-line="97" selection-end-column="23" />
+              <folding>
+                <element signature="e#1315#1316#0" expanded="true" />
+                <element signature="e#1349#1350#0" expanded="true" />
+                <element signature="e#1392#1393#0" expanded="true" />
+                <element signature="e#1425#1426#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Board.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/board/Board.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="476">
+              <caret line="35" column="43" lean-forward="false" selection-start-line="35" selection-start-column="43" selection-end-line="35" selection-end-column="43" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#addPlayer#0;class#Board#0" expanded="false" />
+                <element signature="e#930#931#0" expanded="true" />
+                <element signature="e#1633#1634#0" expanded="true" />
+                <element signature="e#1669#1670#0" expanded="true" />
+                <element signature="e#2390#2391#0" expanded="true" />
+                <element signature="e#2416#2417#0" expanded="true" />
+                <element signature="e#2588#2589#0" expanded="true" />
+                <element signature="e#2636#2637#0" expanded="true" />
+                <element signature="e#2680#2681#0" expanded="true" />
+                <element signature="e#2719#2720#0" expanded="true" />
+                <element signature="e#2762#2763#0" expanded="true" />
+                <element signature="e#2800#2801#0" expanded="true" />
+                <element signature="e#3345#3346#0" expanded="true" />
+                <element signature="e#3379#3380#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="FourInARowGUI.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/interfaces/FourInARowGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1887">
+              <caret line="123" column="29" lean-forward="true" selection-start-line="123" selection-start-column="29" selection-end-line="123" selection-end-column="29" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Interface" />
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>four</find>
+      <find>checkWin</find>
+    </findStrings>
+  </component>
+  <component name="GradleLocalSettings">
+    <option name="externalProjectsViewState">
+      <projects_view />
+    </option>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/src/IBoard.java" />
+        <option value="$PROJECT_DIR$/src/Board.java" />
+        <option value="$PROJECT_DIR$/src/Plan.txt" />
+        <option value="$PROJECT_DIR$/src/Token.java" />
+        <option value="$PROJECT_DIR$/src/Empty.java" />
+        <option value="$PROJECT_DIR$/src/IWinCondition.java" />
+        <option value="$PROJECT_DIR$/src/Player.java" />
+        <option value="$PROJECT_DIR$/src/IGrid.java" />
+        <option value="$PROJECT_DIR$/src/Grid.java" />
+        <option value="$PROJECT_DIR$/src/Objects/Player.java" />
+        <option value="$PROJECT_DIR$/src/IGameInterface.java" />
+        <option value="$PROJECT_DIR$/src/Objects/GameObject.java" />
+        <option value="$PROJECT_DIR$/src/Objects/Empty.java" />
+        <option value="$PROJECT_DIR$/src/Objects/Token.java" />
+        <option value="$PROJECT_DIR$/src/IRandomEvent.java" />
+        <option value="$PROJECT_DIR$/src/RandomEvent.java" />
+        <option value="$PROJECT_DIR$/src/GUI.java" />
+        <option value="$PROJECT_DIR$/src/interfaces/IGameInterface.java" />
+        <option value="$PROJECT_DIR$/test/GridTest.java" />
+        <option value="$PROJECT_DIR$/src/board/IGrid.java" />
+        <option value="$PROJECT_DIR$/src/objects/GameObject.java" />
+        <option value="$PROJECT_DIR$/src/interfaces/NInARow.java" />
+        <option value="$PROJECT_DIR$/src/interfaces/TicTacToe.java" />
+        <option value="$PROJECT_DIR$/src/objects/Player.java" />
+        <option value="$PROJECT_DIR$/src/objects/Immovable.java" />
+        <option value="$PROJECT_DIR$/src/events/Block.java" />
+        <option value="$PROJECT_DIR$/src/events/Bomb.java" />
+        <option value="$PROJECT_DIR$/src/Main.java" />
+        <option value="$PROJECT_DIR$/src/interfaces/TicTacToeGUI.java" />
+        <option value="$PROJECT_DIR$/test/TicTacToeTest.java" />
+        <option value="$PROJECT_DIR$/src/events/FourInARow.java" />
+        <option value="$PROJECT_DIR$/src/events/IWinCondition.java" />
+        <option value="$PROJECT_DIR$/test/FourInARowTest.java" />
+        <option value="$PROJECT_DIR$/src/events/ThreeInARow.java" />
+        <option value="$PROJECT_DIR$/src/board/Grid.java" />
+        <option value="$PROJECT_DIR$/src/events/InARow.java" />
+        <option value="$PROJECT_DIR$/src/events/RandomEvent.java" />
+        <option value="$PROJECT_DIR$/src/board/IBoard.java" />
+        <option value="$PROJECT_DIR$/src/board/Board.java" />
+        <option value="$PROJECT_DIR$/src/interfaces/NInARowGUI.java" />
+        <option value="$PROJECT_DIR$/src/interfaces/FourInARowGUI.java" />
+        <option value="$PROJECT_DIR$/src/interfaces/GUI.java" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-7" />
+    <option name="width" value="974" />
+    <option name="height" value="1047" />
+  </component>
+  <component name="ProjectInspectionProfilesVisibleTreeState">
+    <entry key="Project Default">
+      <profile-state>
+        <expanded-state>
+          <State>
+            <id />
+          </State>
+          <State>
+            <id>Java</id>
+          </State>
+          <State>
+            <id>Probable bugsJava</id>
+          </State>
+        </expanded-state>
+        <selected-state>
+          <State>
+            <id>SuspiciousSystemArraycopy</id>
+          </State>
+        </selected-state>
+      </profile-state>
+    </entry>
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+      <manualOrder />
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="AndroidView" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="Four-In-A-Row" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Four-In-A-Row" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Four-In-A-Row" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Four-In-A-Row" type="462c0819:PsiDirectoryNode" />
+              <item name="out" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Four-In-A-Row" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Four-In-A-Row" type="462c0819:PsiDirectoryNode" />
+              <item name="out" type="462c0819:PsiDirectoryNode" />
+              <item name="artifacts" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Four-In-A-Row" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Four-In-A-Row" type="462c0819:PsiDirectoryNode" />
+              <item name="out" type="462c0819:PsiDirectoryNode" />
+              <item name="artifacts" type="462c0819:PsiDirectoryNode" />
+              <item name="Four_In_A_Row" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Four-In-A-Row" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Four-In-A-Row" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Four-In-A-Row" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Four-In-A-Row" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="board" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Four-In-A-Row" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Four-In-A-Row" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="events" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Four-In-A-Row" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Four-In-A-Row" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="interfaces" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Four-In-A-Row" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Four-In-A-Row" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="objects" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="Four-In-A-Row" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Four-In-A-Row" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
+      <pane id="Scratches" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.2" />
+    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
+    <property name="Downloaded.Files.Path.Enabled" value="false" />
+    <property name="Repository.Attach.JavaDocs" value="false" />
+    <property name="Repository.Attach.Sources" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="GenerateAntBuildDialog.enableUiFormCompile" value="true" />
+    <property name="GenerateAntBuildDialog.forceTargetJdk" value="true" />
+    <property name="GenerateAntBuildDialog.backupFiles" value="true" />
+    <property name="GenerateAntBuildDialog.outputFileNameProperty" value="four-in-a-row" />
+    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager" selected="Application.Main">
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <module />
+    </configuration>
+    <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="Main" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="Four-In-A-Row" />
+      <envs />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+    </configuration>
+    <configuration name="FourInARowTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="Four-In-A-Row" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="FourInARowTest" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration name="GridTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="Four-In-A-Row" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="GridTest" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration name="TicTacToeTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="Four-In-A-Row" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="TicTacToeTest" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
+    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+      <option name="PROGRAM_PARAMETERS" />
+      <predefined_log_file id="idea.log" enabled="true" />
+    </configuration>
+    <configuration name="&lt;template&gt;" type="TestNG" default="true" selected="false">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+    </configuration>
+    <list size="4">
+      <item index="0" class="java.lang.String" itemvalue="Application.Main" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.GridTest" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.FourInARowTest" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.TicTacToeTest" />
+    </list>
+    <recent_temporary>
+      <list size="4">
+        <item index="0" class="java.lang.String" itemvalue="Application.Main" />
+        <item index="1" class="java.lang.String" itemvalue="JUnit.TicTacToeTest" />
+        <item index="2" class="java.lang.String" itemvalue="JUnit.FourInARowTest" />
+        <item index="3" class="java.lang.String" itemvalue="JUnit.GridTest" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="69d4eee3-654f-4f1f-a941-c4798b813245" name="Default" comment="" />
+      <created>1523355832400</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1523355832400</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="TestHistory">
+    <history-entry file="FourInARowTest - 2018.04.14 at 14h 05m 58s.xml">
+      <configuration name="FourInARowTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="FourInARowTest - 2018.04.14 at 14h 07m 47s.xml">
+      <configuration name="FourInARowTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="GridTest - 2018.04.14 at 14h 06m 03s.xml">
+      <configuration name="GridTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="GridTest - 2018.04.14 at 14h 06m 05s.xml">
+      <configuration name="GridTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TicTacToeTest - 2018.04.14 at 13h 45m 27s.xml">
+      <configuration name="TicTacToeTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TicTacToeTest - 2018.04.14 at 13h 45m 52s.xml">
+      <configuration name="TicTacToeTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TicTacToeTest - 2018.04.14 at 13h 51m 52s.xml">
+      <configuration name="TicTacToeTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TicTacToeTest - 2018.04.14 at 14h 06m 01s.xml">
+      <configuration name="TicTacToeTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TicTacToeTest - 2018.04.14 at 14h 07m 49s.xml">
+      <configuration name="TicTacToeTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TicTacToeTest - 2018.04.14 at 14h 08m 06s.xml">
+      <configuration name="TicTacToeTest" configurationId="JUnit" />
+    </history-entry>
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <layout>
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32934782" sideWeight="0.57995737" order="0" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27608696" sideWeight="0.42004263" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32934782" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12260128" sideWeight="0.5" order="4" side_tool="false" content_ui="combo" />
+      <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32934782" sideWeight="0.4978678" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39846322" sideWeight="0.48720682" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="combo" />
+      <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32930845" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32717392" sideWeight="0.42963752" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32930845" sideWeight="0.48687088" order="7" side_tool="false" content_ui="tabs" />
+    </layout>
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <option name="time" value="6" />
+    </breakpoint-manager>
+    <watches-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/events/InARow.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" column="20" lean-forward="false" selection-start-line="2" selection-start-column="20" selection-end-line="2" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/events/IWinCondition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="9" column="17" lean-forward="false" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/events/RandomEvent.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="7" column="29" lean-forward="false" selection-start-line="7" selection-start-column="29" selection-end-line="7" selection-end-column="29" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/events/Block.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="136">
+          <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#288#289#0" expanded="true" />
+            <element signature="e#344#345#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/interfaces/NInARowGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2652">
+          <caret line="170" column="37" lean-forward="true" selection-start-line="170" selection-start-column="37" selection-end-line="170" selection-end-column="38" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/board/IBoard.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="21" column="24" lean-forward="true" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/board/Grid.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1547">
+          <caret line="95" column="8" lean-forward="false" selection-start-line="95" selection-start-column="8" selection-end-line="97" selection-end-column="23" />
+          <folding>
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1349#1350#0" expanded="true" />
+            <element signature="e#1392#1393#0" expanded="true" />
+            <element signature="e#1425#1426#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/board/Board.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="476">
+          <caret line="35" column="43" lean-forward="false" selection-start-line="35" selection-start-column="43" selection-end-line="35" selection-end-column="43" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#addPlayer#0;class#Board#0" expanded="false" />
+            <element signature="e#930#931#0" expanded="true" />
+            <element signature="e#1633#1634#0" expanded="true" />
+            <element signature="e#1669#1670#0" expanded="true" />
+            <element signature="e#2390#2391#0" expanded="true" />
+            <element signature="e#2416#2417#0" expanded="true" />
+            <element signature="e#2588#2589#0" expanded="true" />
+            <element signature="e#2636#2637#0" expanded="true" />
+            <element signature="e#2680#2681#0" expanded="true" />
+            <element signature="e#2719#2720#0" expanded="true" />
+            <element signature="e#2762#2763#0" expanded="true" />
+            <element signature="e#2800#2801#0" expanded="true" />
+            <element signature="e#3345#3346#0" expanded="true" />
+            <element signature="e#3379#3380#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/interfaces/FourInARowGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1887">
+          <caret line="123" column="29" lean-forward="true" selection-start-line="123" selection-start-column="29" selection-end-line="123" selection-end-column="29" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/interfaces/GUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="136">
+          <caret line="8" column="18" lean-forward="false" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
+          <folding>
+            <element signature="e#1588#1589#0" expanded="true" />
+            <element signature="e#1655#1656#0" expanded="true" />
+            <element signature="e#1699#1700#0" expanded="true" />
+            <element signature="e#1735#1736#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Plan.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="37" column="31" lean-forward="false" selection-start-line="37" selection-start-column="31" selection-end-line="37" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/util/ArrayList.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="189">
+          <caret line="432" column="0" lean-forward="false" selection-start-line="432" selection-start-column="0" selection-end-line="432" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/interfaces/IGameInterface.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" column="10" lean-forward="false" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/GridTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="189">
+          <caret line="15" column="32" lean-forward="false" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/objects/Player.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="12" column="5" lean-forward="true" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/board/IGrid.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="444">
+          <caret line="68" column="8" lean-forward="false" selection-start-line="68" selection-start-column="8" selection-end-line="68" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/events/IRandomEvent.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="136">
+          <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/objects/Empty.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" column="13" lean-forward="false" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/objects/Token.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="7" column="33" lean-forward="false" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/objects/Immovable.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="5" column="22" lean-forward="false" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/events/Bomb.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="25" column="47" lean-forward="false" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/objects/GameObject.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="34" lean-forward="false" selection-start-line="4" selection-start-column="34" selection-end-line="4" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/interfaces/TicTacToeGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="481">
+          <caret line="134" column="39" lean-forward="false" selection-start-line="134" selection-start-column="39" selection-end-line="134" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/TicTacToeTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="448">
+          <caret line="78" column="31" lean-forward="false" selection-start-line="78" selection-start-column="31" selection-end-line="78" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/FourInARowTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="884">
+          <caret line="52" column="63" lean-forward="false" selection-start-line="52" selection-start-column="63" selection-end-line="52" selection-end-column="63" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/events/ThreeInARow.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="7" column="38" lean-forward="true" selection-start-line="7" selection-start-column="38" selection-end-line="7" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/events/FourInARow.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="5" column="13" lean-forward="true" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/events/Block.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="136">
+          <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#288#289#0" expanded="true" />
+            <element signature="e#344#345#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/events/InARow.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" column="20" lean-forward="false" selection-start-line="2" selection-start-column="20" selection-end-line="2" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/events/IWinCondition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="9" column="17" lean-forward="false" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/events/RandomEvent.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="7" column="29" lean-forward="false" selection-start-line="7" selection-start-column="29" selection-end-line="7" selection-end-column="29" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/board/Grid.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1547">
+          <caret line="95" column="8" lean-forward="false" selection-start-line="95" selection-start-column="8" selection-end-line="97" selection-end-column="23" />
+          <folding>
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1349#1350#0" expanded="true" />
+            <element signature="e#1392#1393#0" expanded="true" />
+            <element signature="e#1425#1426#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/board/IBoard.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="21" column="24" lean-forward="true" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/board/Board.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="476">
+          <caret line="35" column="43" lean-forward="false" selection-start-line="35" selection-start-column="43" selection-end-line="35" selection-end-column="43" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#addPlayer#0;class#Board#0" expanded="false" />
+            <element signature="e#930#931#0" expanded="true" />
+            <element signature="e#1633#1634#0" expanded="true" />
+            <element signature="e#1669#1670#0" expanded="true" />
+            <element signature="e#2390#2391#0" expanded="true" />
+            <element signature="e#2416#2417#0" expanded="true" />
+            <element signature="e#2588#2589#0" expanded="true" />
+            <element signature="e#2636#2637#0" expanded="true" />
+            <element signature="e#2680#2681#0" expanded="true" />
+            <element signature="e#2719#2720#0" expanded="true" />
+            <element signature="e#2762#2763#0" expanded="true" />
+            <element signature="e#2800#2801#0" expanded="true" />
+            <element signature="e#3345#3346#0" expanded="true" />
+            <element signature="e#3379#3380#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/interfaces/NInARowGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2652">
+          <caret line="170" column="37" lean-forward="true" selection-start-line="170" selection-start-column="37" selection-end-line="170" selection-end-column="38" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/interfaces/FourInARowGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1887">
+          <caret line="123" column="29" lean-forward="true" selection-start-line="123" selection-start-column="29" selection-end-line="123" selection-end-column="29" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/interfaces/GUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="136">
+          <caret line="8" column="18" lean-forward="false" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
+          <folding>
+            <element signature="e#1588#1589#0" expanded="true" />
+            <element signature="e#1655#1656#0" expanded="true" />
+            <element signature="e#1699#1700#0" expanded="true" />
+            <element signature="e#1735#1736#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ArtifactsStructureConfigurable.UI">
+        <settings>
+          <artifact-editor />
+          <last-edited>Four-In-A-Row</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+                <option value="0.5" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="FacetStructureConfigurable.UI">
+        <settings>
+          <last-edited>No facets are configured</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="GlobalLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="JdkListConfigurable.UI">
+        <settings>
+          <last-edited>9.0</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ModuleStructureConfigurable.UI">
+        <settings>
+          <last-edited>Four-In-A-Row</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+                <option value="0.6" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectLibrariesConfigurable.UI">
+        <settings>
+          <last-edited>junit:junit:5.0-SNAPSHOT</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>
\ No newline at end of file
diff --git a/Four-In-A-Row.iml b/Four-In-A-Row.iml
new file mode 100644
index 0000000..a0637c7
--- /dev/null
+++ b/Four-In-A-Row.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="junit:junit:5.0-SNAPSHOT" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5ee19cb
--- /dev/null
+++ b/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: Main
+
diff --git a/out/artifacts/Four_In_A_Row/Four-In-A-Row.jar b/out/artifacts/Four_In_A_Row/Four-In-A-Row.jar
new file mode 100644
index 0000000..3328e77
Binary files /dev/null and b/out/artifacts/Four_In_A_Row/Four-In-A-Row.jar differ
diff --git a/out/artifacts/Four_In_A_Row/Four-In-A-Row.zip b/out/artifacts/Four_In_A_Row/Four-In-A-Row.zip
new file mode 100644
index 0000000..94f250d
Binary files /dev/null and b/out/artifacts/Four_In_A_Row/Four-In-A-Row.zip differ
diff --git a/out/production/Four-In-A-Row/Main$1.class b/out/production/Four-In-A-Row/Main$1.class
new file mode 100644
index 0000000..12e5083
Binary files /dev/null and b/out/production/Four-In-A-Row/Main$1.class differ
diff --git a/out/production/Four-In-A-Row/Main$Gamemode.class b/out/production/Four-In-A-Row/Main$Gamemode.class
new file mode 100644
index 0000000..2bfb06e
Binary files /dev/null and b/out/production/Four-In-A-Row/Main$Gamemode.class differ
diff --git a/out/production/Four-In-A-Row/Main.class b/out/production/Four-In-A-Row/Main.class
new file mode 100644
index 0000000..0bdd2b0
Binary files /dev/null and b/out/production/Four-In-A-Row/Main.class differ
diff --git a/out/production/Four-In-A-Row/Plan.txt b/out/production/Four-In-A-Row/Plan.txt
new file mode 100644
index 0000000..622c6c9
--- /dev/null
+++ b/out/production/Four-In-A-Row/Plan.txt
@@ -0,0 +1,70 @@
+Two dimensional array.
+Render each subarray from bottom to top.
+Place each piece in the start of the array.
+
+Let user choose from a button above each row where to place a chip.
+
+Keep count of player names and colors, maybe with some text input.
+objects.Player has name and color.
+
+Turn + Events
+
+Width = 7, Height = 6
+
+Check from each block of a color (maybe keep track of blocked pieces for effectiveness).
+Maybe allow for custom combinations required to win.
+
+Game
+- Winning Conditions
+- board.Board
+- GameObjects
+- Random events
+- Input/Output
+- Players
+
+Players
+Class with info about player <- passive
+- name
+- color (of token)
+
+Interface for a player's actions <- active
+- Methods for throwing token into column.
+- +Info
+
+Input/Output
+- Input interface
+ * int getNextColumn(objects.Player p); //Retrieve user input
+- Output interface
+ * void displayBoard(board.IBoard b);
+ * void displayMessage(String s);
+
+ Random Events
+ - Interface events.IRandomEvent
+  * void act(board.IBoard b);
+  * String announcement();
+
+events.IRandomEvent
+Abstract events.RandomEvent implements events.IRandomEvent (void flipCoin // Does something if heads)
+Shuffle extends events.RandomEvent
+
+objects.GameObject
+objects.Token
+ Owner instanceof objects.Player
+
+GameObjects(objects.Token, empty)
+ * One class
+  * getColor();
+
+Winning Conditions
+ - Interface events.IWinCondition
+  * boolean hasWon(objects.Player p, board.IBoard board);
+
+
+ "Main" method (Game)
+ - Outer loop: "While the game has not been finished"
+ 1) Determine who's turn
+ 2) Get next input: int j = input.getNextColumn(p);
+ 3) Execute move: p throws in column j.
+ 4) Check if p has won.
+ 5) Update view (output.displayBoard())
+ 6) events.RandomEvent.act();
\ No newline at end of file
diff --git a/out/production/Four-In-A-Row/board/Board.class b/out/production/Four-In-A-Row/board/Board.class
new file mode 100644
index 0000000..e685ad9
Binary files /dev/null and b/out/production/Four-In-A-Row/board/Board.class differ
diff --git a/out/production/Four-In-A-Row/board/Grid.class b/out/production/Four-In-A-Row/board/Grid.class
new file mode 100644
index 0000000..d489f4a
Binary files /dev/null and b/out/production/Four-In-A-Row/board/Grid.class differ
diff --git a/out/production/Four-In-A-Row/board/IBoard.class b/out/production/Four-In-A-Row/board/IBoard.class
new file mode 100644
index 0000000..0a95037
Binary files /dev/null and b/out/production/Four-In-A-Row/board/IBoard.class differ
diff --git a/out/production/Four-In-A-Row/board/IGrid.class b/out/production/Four-In-A-Row/board/IGrid.class
new file mode 100644
index 0000000..8030b1a
Binary files /dev/null and b/out/production/Four-In-A-Row/board/IGrid.class differ
diff --git a/out/production/Four-In-A-Row/events/Block.class b/out/production/Four-In-A-Row/events/Block.class
new file mode 100644
index 0000000..d3e568b
Binary files /dev/null and b/out/production/Four-In-A-Row/events/Block.class differ
diff --git a/out/production/Four-In-A-Row/events/Bomb.class b/out/production/Four-In-A-Row/events/Bomb.class
new file mode 100644
index 0000000..6fae05d
Binary files /dev/null and b/out/production/Four-In-A-Row/events/Bomb.class differ
diff --git a/out/production/Four-In-A-Row/events/FourInARow.class b/out/production/Four-In-A-Row/events/FourInARow.class
new file mode 100644
index 0000000..f7a65e5
Binary files /dev/null and b/out/production/Four-In-A-Row/events/FourInARow.class differ
diff --git a/out/production/Four-In-A-Row/events/IRandomEvent.class b/out/production/Four-In-A-Row/events/IRandomEvent.class
new file mode 100644
index 0000000..ff9e401
Binary files /dev/null and b/out/production/Four-In-A-Row/events/IRandomEvent.class differ
diff --git a/out/production/Four-In-A-Row/events/IWinCondition.class b/out/production/Four-In-A-Row/events/IWinCondition.class
new file mode 100644
index 0000000..07dc184
Binary files /dev/null and b/out/production/Four-In-A-Row/events/IWinCondition.class differ
diff --git a/out/production/Four-In-A-Row/events/InARow.class b/out/production/Four-In-A-Row/events/InARow.class
new file mode 100644
index 0000000..54f1fcb
Binary files /dev/null and b/out/production/Four-In-A-Row/events/InARow.class differ
diff --git a/out/production/Four-In-A-Row/events/RandomEvent.class b/out/production/Four-In-A-Row/events/RandomEvent.class
new file mode 100644
index 0000000..53497b3
Binary files /dev/null and b/out/production/Four-In-A-Row/events/RandomEvent.class differ
diff --git a/out/production/Four-In-A-Row/events/ThreeInARow.class b/out/production/Four-In-A-Row/events/ThreeInARow.class
new file mode 100644
index 0000000..e57248c
Binary files /dev/null and b/out/production/Four-In-A-Row/events/ThreeInARow.class differ
diff --git a/out/production/Four-In-A-Row/interfaces/FourInARowGUI$1.class b/out/production/Four-In-A-Row/interfaces/FourInARowGUI$1.class
new file mode 100644
index 0000000..31cc8ea
Binary files /dev/null and b/out/production/Four-In-A-Row/interfaces/FourInARowGUI$1.class differ
diff --git a/out/production/Four-In-A-Row/interfaces/FourInARowGUI.class b/out/production/Four-In-A-Row/interfaces/FourInARowGUI.class
new file mode 100644
index 0000000..a22dae8
Binary files /dev/null and b/out/production/Four-In-A-Row/interfaces/FourInARowGUI.class differ
diff --git a/out/production/Four-In-A-Row/interfaces/GUI.class b/out/production/Four-In-A-Row/interfaces/GUI.class
new file mode 100644
index 0000000..8c6f1ab
Binary files /dev/null and b/out/production/Four-In-A-Row/interfaces/GUI.class differ
diff --git a/out/production/Four-In-A-Row/interfaces/IGameInterface.class b/out/production/Four-In-A-Row/interfaces/IGameInterface.class
new file mode 100644
index 0000000..52a580e
Binary files /dev/null and b/out/production/Four-In-A-Row/interfaces/IGameInterface.class differ
diff --git a/out/production/Four-In-A-Row/interfaces/NInARowGUI$1.class b/out/production/Four-In-A-Row/interfaces/NInARowGUI$1.class
new file mode 100644
index 0000000..483883b
Binary files /dev/null and b/out/production/Four-In-A-Row/interfaces/NInARowGUI$1.class differ
diff --git a/out/production/Four-In-A-Row/interfaces/NInARowGUI.class b/out/production/Four-In-A-Row/interfaces/NInARowGUI.class
new file mode 100644
index 0000000..6abe86f
Binary files /dev/null and b/out/production/Four-In-A-Row/interfaces/NInARowGUI.class differ
diff --git a/out/production/Four-In-A-Row/interfaces/TicTacToeGUI$1.class b/out/production/Four-In-A-Row/interfaces/TicTacToeGUI$1.class
new file mode 100644
index 0000000..a9311f0
Binary files /dev/null and b/out/production/Four-In-A-Row/interfaces/TicTacToeGUI$1.class differ
diff --git a/out/production/Four-In-A-Row/interfaces/TicTacToeGUI.class b/out/production/Four-In-A-Row/interfaces/TicTacToeGUI.class
new file mode 100644
index 0000000..9ef2346
Binary files /dev/null and b/out/production/Four-In-A-Row/interfaces/TicTacToeGUI.class differ
diff --git a/out/production/Four-In-A-Row/objects/Empty.class b/out/production/Four-In-A-Row/objects/Empty.class
new file mode 100644
index 0000000..09f6616
Binary files /dev/null and b/out/production/Four-In-A-Row/objects/Empty.class differ
diff --git a/out/production/Four-In-A-Row/objects/GameObject.class b/out/production/Four-In-A-Row/objects/GameObject.class
new file mode 100644
index 0000000..514a064
Binary files /dev/null and b/out/production/Four-In-A-Row/objects/GameObject.class differ
diff --git a/out/production/Four-In-A-Row/objects/Immovable.class b/out/production/Four-In-A-Row/objects/Immovable.class
new file mode 100644
index 0000000..62fb8f0
Binary files /dev/null and b/out/production/Four-In-A-Row/objects/Immovable.class differ
diff --git a/out/production/Four-In-A-Row/objects/Player.class b/out/production/Four-In-A-Row/objects/Player.class
new file mode 100644
index 0000000..75c39c2
Binary files /dev/null and b/out/production/Four-In-A-Row/objects/Player.class differ
diff --git a/out/production/Four-In-A-Row/objects/Token.class b/out/production/Four-In-A-Row/objects/Token.class
new file mode 100644
index 0000000..76b7a37
Binary files /dev/null and b/out/production/Four-In-A-Row/objects/Token.class differ
diff --git a/out/test/Four-In-A-Row/FourInARowTest.class b/out/test/Four-In-A-Row/FourInARowTest.class
new file mode 100644
index 0000000..0680908
Binary files /dev/null and b/out/test/Four-In-A-Row/FourInARowTest.class differ
diff --git a/out/test/Four-In-A-Row/GridTest.class b/out/test/Four-In-A-Row/GridTest.class
new file mode 100644
index 0000000..c4080ae
Binary files /dev/null and b/out/test/Four-In-A-Row/GridTest.class differ
diff --git a/out/test/Four-In-A-Row/TicTacToeTest.class b/out/test/Four-In-A-Row/TicTacToeTest.class
new file mode 100644
index 0000000..73d161b
Binary files /dev/null and b/out/test/Four-In-A-Row/TicTacToeTest.class differ
diff --git a/src/Main.java b/src/Main.java
new file mode 100644
index 0000000..1615833
--- /dev/null
+++ b/src/Main.java
@@ -0,0 +1,47 @@
+import board.Board;
+import events.FourInARow;
+import events.IWinCondition;
+import interfaces.FourInARowGUI;
+import interfaces.NInARowGUI;
+import interfaces.TicTacToeGUI;
+import objects.Empty;
+
+import javax.swing.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+class Main {
+    private static final int BOARD_WIDTH = 7;
+    private static final int BOARD_HEIGHT = 6;
+    private enum Gamemode {TICTACTOE, FOURINAROWCLASSIC, FOURINAROW}
+
+    public static void main(String[] args) {
+        HashMap<String, Gamemode> modeList = new HashMap<>();
+        modeList.put("Tic-Tac-Toe", Gamemode.TICTACTOE);
+        modeList.put("Four in a row classic", Gamemode.FOURINAROWCLASSIC);
+        modeList.put("Four in a row", Gamemode.FOURINAROW);
+        Object[] keys =  modeList.keySet().toArray();
+
+        String selectedValue = (String)JOptionPane.showInputDialog(null, "Select a game from the list below:", "Car model...", JOptionPane.QUESTION_MESSAGE,null, keys, keys[0]);
+        if (selectedValue == null) {
+            System.exit(0);
+        }
+        List<IWinCondition> con = new ArrayList<>();
+        con.add(new FourInARow());
+        switch (modeList.get(selectedValue)) {
+            case TICTACTOE:
+                new TicTacToeGUI();
+                break;
+            case FOURINAROWCLASSIC:
+                new FourInARowGUI(BOARD_WIDTH, BOARD_HEIGHT, new Board(BOARD_WIDTH, BOARD_HEIGHT, new Empty(), con));
+                break;
+            case FOURINAROW:
+                new NInARowGUI(BOARD_WIDTH, BOARD_HEIGHT, new Board(BOARD_WIDTH, BOARD_HEIGHT, new Empty(), con));
+                break;
+             default:
+                System.exit(0);
+        }
+
+    }
+}
diff --git a/src/Plan.txt b/src/Plan.txt
new file mode 100644
index 0000000..622c6c9
--- /dev/null
+++ b/src/Plan.txt
@@ -0,0 +1,70 @@
+Two dimensional array.
+Render each subarray from bottom to top.
+Place each piece in the start of the array.
+
+Let user choose from a button above each row where to place a chip.
+
+Keep count of player names and colors, maybe with some text input.
+objects.Player has name and color.
+
+Turn + Events
+
+Width = 7, Height = 6
+
+Check from each block of a color (maybe keep track of blocked pieces for effectiveness).
+Maybe allow for custom combinations required to win.
+
+Game
+- Winning Conditions
+- board.Board
+- GameObjects
+- Random events
+- Input/Output
+- Players
+
+Players
+Class with info about player <- passive
+- name
+- color (of token)
+
+Interface for a player's actions <- active
+- Methods for throwing token into column.
+- +Info
+
+Input/Output
+- Input interface
+ * int getNextColumn(objects.Player p); //Retrieve user input
+- Output interface
+ * void displayBoard(board.IBoard b);
+ * void displayMessage(String s);
+
+ Random Events
+ - Interface events.IRandomEvent
+  * void act(board.IBoard b);
+  * String announcement();
+
+events.IRandomEvent
+Abstract events.RandomEvent implements events.IRandomEvent (void flipCoin // Does something if heads)
+Shuffle extends events.RandomEvent
+
+objects.GameObject
+objects.Token
+ Owner instanceof objects.Player
+
+GameObjects(objects.Token, empty)
+ * One class
+  * getColor();
+
+Winning Conditions
+ - Interface events.IWinCondition
+  * boolean hasWon(objects.Player p, board.IBoard board);
+
+
+ "Main" method (Game)
+ - Outer loop: "While the game has not been finished"
+ 1) Determine who's turn
+ 2) Get next input: int j = input.getNextColumn(p);
+ 3) Execute move: p throws in column j.
+ 4) Check if p has won.
+ 5) Update view (output.displayBoard())
+ 6) events.RandomEvent.act();
\ No newline at end of file
diff --git a/src/board/Board.java b/src/board/Board.java
new file mode 100644
index 0000000..559854e
--- /dev/null
+++ b/src/board/Board.java
@@ -0,0 +1,149 @@
+package board;
+
+import events.IWinCondition;
+import objects.GameObject;
+import objects.Player;
+import objects.Token;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class Board implements IBoard{
+    private final Grid<GameObject> grid;
+    private final List<Player> players;
+    private int playersTurn = 0;
+    private final List<IWinCondition> conditionList;
+    private boolean won = false;
+
+    public Board(int width, int height, GameObject obj, List<IWinCondition> conditions) {
+        grid = new Grid<>(width, height, obj);
+        players = new ArrayList<>();
+        conditionList = conditions;
+    }
+
+    @Override
+    public boolean addPlayer(Player p) {
+        if (!playerExists(p)) {
+            players.add(p);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public ArrayList<Player> getPlayers() {
+        return new ArrayList<>(players);
+    }
+
+    /**
+     * Gets the next player.
+     *
+     * @return A Player
+     */
+    public Player nextPlayer() {
+        Player p = players.get(playersTurn);
+        this.playersTurn = this.playersTurn + 2 > this.players.size() ? 0 : this.playersTurn + 1;
+        return p;
+    }
+
+    /**
+     * Makes sure we don't have two equal players.
+     *
+     * @param player    The new player to test
+     * @return          True if the player is non-unique
+     */
+    private boolean playerExists(Player player) {
+        for (Player p : players) {
+            if (player.equals(p)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean isFull() {
+        return grid.isFull();
+    }
+
+    /**
+     * Checks if anyone has won.
+     *
+     * @param i The column of the last dropped object
+     */
+    private void checkWin(int i) {
+        for (IWinCondition con : conditionList) {
+            if (con.hasWon(i, getTopObject(i), this)) {
+                won = true;
+            }
+        }
+    }
+
+    /**
+     * Checks if anyone has won.
+     *
+     * @param x The x-coordinate of the last dropped object
+     * @param y The y-coordinate of the last dropped object
+     */
+    private void checkWin(int x, int y) {
+        for (IWinCondition con : conditionList) {
+            if (con.hasWon(x, y, this)) {
+                won = true;
+            }
+        }
+    }
+
+    @Override
+    public boolean won() {
+        return won;
+    }
+
+    @Override
+    public void flush() {
+        grid.flush();
+        playersTurn = 0;
+        won = false;
+    }
+
+    @Override
+    public int getTopObject(int column) {
+        return grid.getTopObject(column);
+    }
+
+    @Override
+    public int getHeight() {
+        return grid.getHeight();
+    }
+
+    @Override
+    public int getWidth() {
+        return grid.getWidth();
+    }
+
+    @Override
+    public void set(int x, int y, GameObject element) {
+        grid.set(x, y, element);
+        if (element instanceof Token) {
+            checkWin(x, y);
+        }
+    }
+
+    @Override
+    public boolean drop(int i, GameObject element) {
+        boolean dropped = grid.drop(i, element);
+        if (element instanceof Token) {
+            checkWin(i);
+        }
+        return dropped;
+    }
+
+    @Override
+    public GameObject get(int x, int y) { return grid.get(x, y); }
+
+    @Override
+    public IGrid<GameObject> copy() {
+        return grid.copy();
+    }
+}
\ No newline at end of file
diff --git a/src/board/Grid.java b/src/board/Grid.java
new file mode 100644
index 0000000..efe315d
--- /dev/null
+++ b/src/board/Grid.java
@@ -0,0 +1,100 @@
+package board;
+
+import objects.Token;
+
+public class Grid<T> implements IGrid<T> {
+    private final T[][] grid;
+    private final int width;
+    private final int height;
+    private final T empty;
+
+    public Grid(int width, int height, T object) {
+        T[][] list = (T[][])new Object[width][height];
+        for (int i = 0; i < width; i++) {
+            for (int j = 0; j < height; j++) {
+                list[i][j] = object;
+            }
+        }
+        grid = list;
+        this.empty = object;
+        this.width = width;
+        this.height = height;
+    }
+
+    public void flush() {
+        for (int i = 0; i < width; i++) {
+            for (int j = 0; j < height; j++) {
+                grid[i][j] = empty;
+            }
+        }
+    }
+
+    public boolean isFull() {
+        int empty = 0;
+        for (T[] list : grid) {
+            for (T item : list) {
+                if (this.empty.getClass().isInstance(item)) {
+                    empty++;
+                }
+            }
+        }
+        return empty < 1;
+    }
+
+    @Override
+    public int getTopObject(int column) {
+        for (int j = this.height - 1; j > -1; j--) {
+            if (grid[column][j] instanceof Token) {
+                return j;
+            }
+        }
+        return -1;
+    }
+
+    @Override
+    public int getHeight() {
+        return this.height;
+    }
+
+    @Override
+    public int getWidth() {
+        return this.width;
+    }
+
+    @Override
+    public boolean drop(int i, T element) {
+        if (i > width || i < 0) {
+            throw new IllegalArgumentException("Index out of bounds.");
+        }
+        for (int j = 0; j < this.height; j++) {
+            if (this.empty.getClass().isInstance(grid[i][j])) {
+                grid[i][j] = element;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void set(int x, int y, T element) {
+        if (x > width || y > height || x < 0 || y < 0) {
+            throw new IllegalArgumentException("Index out of bounds.");
+        }
+        grid[x][y] = element;
+    }
+
+    @Override
+    public T get(int x, int y) {
+        if (y >= height || x >= width || x < 0 || y < 0) {
+            throw new IllegalArgumentException("Index out of bound.");
+        }
+        return grid[x][y];
+    }
+
+    @Override
+    public IGrid<T> copy() {
+        Grid<T> newGrid = new Grid<>(width, height, empty);
+        System.arraycopy(grid, 0, newGrid.grid, 0, width);
+        return newGrid;
+    }
+}
diff --git a/src/board/IBoard.java b/src/board/IBoard.java
new file mode 100644
index 0000000..0616d71
--- /dev/null
+++ b/src/board/IBoard.java
@@ -0,0 +1,50 @@
+package board;
+
+import objects.GameObject;
+import objects.Player;
+
+import java.util.List;
+
+public interface IBoard extends IGrid<GameObject> {
+    /**
+     * Adds a new player to the board.
+     *
+     * @param p The player to add
+     * @return  True if the player is valid
+     */
+    boolean addPlayer(Player p);
+
+    /**
+     * Gets the next player from the board.
+     *
+     * @return  A player
+     */
+    Player nextPlayer();
+
+    /**
+     * Find out if someone has won.
+     *
+     * @return True if someone won
+     */
+    boolean won();
+
+    /**
+     * Flushes all values in the board.
+     */
+    void flush();
+
+    /**
+     * Gets the position of the topmost object in the board's grid.
+     *
+     * @param column    The target column
+     * @return          A position or -1 if all rows are empty
+     */
+    int getTopObject(int column);
+
+    /**
+     * Gets a copy of the players list.
+     *
+     * @return  A list of players
+     */
+    List<Player> getPlayers();
+}
diff --git a/src/board/IGrid.java b/src/board/IGrid.java
new file mode 100644
index 0000000..561f137
--- /dev/null
+++ b/src/board/IGrid.java
@@ -0,0 +1,70 @@
+package board;
+
+public interface IGrid<T> {
+
+    /**
+     * @return The height of the grid.
+     */
+    int getHeight();
+
+    /**
+     * @return The width of the grid.
+     */
+    int getWidth();
+
+    /**
+     *
+     * Set the contents of the cell in the given x,y location.
+     *
+     * y must be greater than or equal to 0 and less than getHeight().
+     * x must be greater than or equal to 0 and less than getWidth().
+     *
+     * @param x The column of the cell to change the contents of.
+     * @param y The row of the cell to change the contents of.
+     * @param element The contents the cell is to have.
+     */
+    void set(int x, int y, T element);
+
+    /**
+     * Drops an element into column i.
+     *
+     * @param i         The target column
+     * @param element   The element to be dropped
+     * @return          True if the column had space for the element
+     */
+    boolean drop(int i, T element);
+
+    /**
+     *
+     * Get the contents of the cell in the given x,y location.
+     *
+     * y must be greater than or equal to 0 and less than getHeight().
+     * x must be greater than or equal to 0 and less than getWidth().
+     *
+     * @param x The column of the cell to get the contents of.
+     * @param y The row of the cell to get contents of.
+     */
+    T get(int x, int y);
+
+    /**
+     * Make a copy
+     *
+     * @return A fresh copy of the grid, with the same elements
+     */
+    IGrid<T> copy();
+
+    /**
+     * Checks if the grid is absolutely full.
+     *
+     * @return  True if it is full
+     */
+    boolean isFull();
+
+    /**
+     * Retrieves the position of the topmost element from a column.
+     *
+     * @param column    The target column
+     * @return          The y-position of the top element
+     */
+    int getTopObject(int column);
+}
\ No newline at end of file
diff --git a/src/events/Block.java b/src/events/Block.java
new file mode 100644
index 0000000..29c8697
--- /dev/null
+++ b/src/events/Block.java
@@ -0,0 +1,17 @@
+package events;
+
+import board.IBoard;
+import objects.Immovable;
+
+public class Block extends RandomEvent {
+    @Override
+    public void act(IBoard b) {
+        int x = random.nextInt(b.getWidth());
+        b.drop(x, new Immovable());
+    }
+
+    @Override
+    public String announcement() {
+        return "An immovable object was placed.";
+    }
+}
diff --git a/src/events/Bomb.java b/src/events/Bomb.java
new file mode 100644
index 0000000..53f899c
--- /dev/null
+++ b/src/events/Bomb.java
@@ -0,0 +1,47 @@
+package events;
+
+import board.IBoard;
+import objects.Empty;
+import objects.Token;
+
+import java.util.ArrayList;
+
+public class Bomb extends RandomEvent {
+    @Override
+    public void act(IBoard b) {
+        int x = random.nextInt(b.getWidth());
+        int y = b.getTopObject(x);
+        for (ArrayList<Integer> list : generateSquare(b, x, y, random.nextInt(2) + 1)) {
+            b.set(list.get(0), list.get(1), new Empty());
+        }
+    }
+
+    /**
+     * Gets all locations in a square a range from a point.
+     *
+     * @param b     A board
+     * @param x     The x index of the starting point
+     * @param y     The y index of the starting point
+     * @param range The range of the square
+     * @return      A list of lists of integers
+     */
+    private ArrayList<ArrayList<Integer>> generateSquare(IBoard b, int x, int y, int range) {
+        ArrayList<ArrayList<Integer>> locations = new ArrayList<>();
+        for (int i = x - range; i <= x + range; i++) {
+            for (int j = y - range; j <= y + range; j++) {
+                if (i >= 0 && i < b.getWidth() && j >= 0 && j < b.getHeight() && b.get(i, j) instanceof Token) {
+                    ArrayList<Integer> coords = new ArrayList<>();
+                    coords.add(i);
+                    coords.add(j);
+                    locations.add(coords);
+                }
+            }
+        }
+        return locations;
+    }
+
+    @Override
+    public String announcement() {
+        return "A bomb just exploded!";
+    }
+}
diff --git a/src/events/FourInARow.java b/src/events/FourInARow.java
new file mode 100644
index 0000000..193cad4
--- /dev/null
+++ b/src/events/FourInARow.java
@@ -0,0 +1,10 @@
+package events;
+
+import board.IBoard;
+
+public class FourInARow extends InARow {
+    @Override
+    public boolean hasWon(int x, int y, IBoard board) {
+        return hasWon(x, y, board, 3);
+    }
+}
diff --git a/src/events/IRandomEvent.java b/src/events/IRandomEvent.java
new file mode 100644
index 0000000..58782d1
--- /dev/null
+++ b/src/events/IRandomEvent.java
@@ -0,0 +1,8 @@
+package events;
+
+import board.IBoard;
+
+public interface IRandomEvent {
+    void act(IBoard b);
+    String announcement();
+}
diff --git a/src/events/IWinCondition.java b/src/events/IWinCondition.java
new file mode 100644
index 0000000..1882628
--- /dev/null
+++ b/src/events/IWinCondition.java
@@ -0,0 +1,18 @@
+package events;
+
+import board.IBoard;
+
+/**
+ * A condition for winning the game.
+ */
+public interface IWinCondition {
+    /**
+     * Checks if someone has won according to the custom conditions.
+     *
+     * @param x     The x-coordinate of the last placed element
+     * @param y     The y-coordinate of the last placed element
+     * @param board The board to check
+     * @return      True if someone has won
+     */
+    boolean hasWon(int x, int y, IBoard board);
+}
diff --git a/src/events/InARow.java b/src/events/InARow.java
new file mode 100644
index 0000000..8de9cc1
--- /dev/null
+++ b/src/events/InARow.java
@@ -0,0 +1,47 @@
+package events;
+
+import board.IBoard;
+
+import java.awt.*;
+
+/**
+ * Contains methods for implementing any n in a row rules.
+ */
+abstract class InARow implements IWinCondition {
+    /**
+     * Checks if the supplied position has enough neighbours in a straight line of the same type
+     *
+     * @param x     The x-coordinate of the start position
+     * @param y     The y-coordinate of the start position
+     * @param board The board on which to perform the task
+     * @param t     The number of elements in a row, which constitutes a win (excluding start position)
+     * @return      True if x, y was a winning move
+     */
+    static boolean hasWon(int x, int y, IBoard board, int t) {
+        return count(x, y, 1, 0, board) + count(x, y, -1, 0, board) >= t ||
+                count(x, y, 0, -1, board) + count(x, y, 0, 1, board) >= t ||
+                count(x, y, 1, 1, board) + count(x, y, -1, -1, board) >= t ||
+                count(x, y, 1, -1, board) + count(x, y, -1, 1, board) >= t;
+    }
+
+    /**
+     * Counts all elements from a start position in a set direction with a matching color.
+     *
+     * @param x     The x-coordinate of the start position
+     * @param y     The y-coordinate of the start position
+     * @param iX    Step amount in x-direction
+     * @param iY    Step amount in y-direction
+     * @param b     The board on which to perform the task
+     * @return      The number of elements found
+     */
+    private static int count(int x, int y, int iX, int iY, IBoard b) {
+        int count = 0;
+        Color target = b.get(x, y).getColor();
+        while ((y + iY >= 0 && y + iY < b.getHeight()) && (x + iX >= 0 && x + iX < b.getWidth()) && b.get(x + iX, y + iY).getColor() == target) {
+            x += iX;
+            y += iY;
+            count++;
+        }
+        return count;
+    }
+}
diff --git a/src/events/RandomEvent.java b/src/events/RandomEvent.java
new file mode 100644
index 0000000..4a035ff
--- /dev/null
+++ b/src/events/RandomEvent.java
@@ -0,0 +1,43 @@
+package events;
+
+import board.IBoard;
+
+import java.util.Random;
+
+/**
+ * Contains basic probability methods usable by all random events.
+ */
+public abstract class RandomEvent implements IRandomEvent {
+    final Random random = new Random();
+
+    /**
+     * Flips a coin, and acts if it comes out as head.
+     *
+     * @param b The board to act on
+     * @return  True if somehting happened. False otherwise
+     */
+    public boolean flipCoin(IBoard b) {
+        if (random.nextInt(2) > 0) {
+            act(b);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Rolls n die, and acts if all die got a "6".
+     *
+     * @param b The board to act on
+     * @param n The number of die
+     * @return  True if something happened. False otherwise
+     */
+    public boolean rollDie(IBoard b, int n) {
+        if (random.nextInt((int)Math.pow(6, n)) < 1) {
+            act(b);
+            return true;
+        }
+        return false;
+    }
+
+    public abstract void act(IBoard b);
+}
diff --git a/src/events/ThreeInARow.java b/src/events/ThreeInARow.java
new file mode 100644
index 0000000..6c13f98
--- /dev/null
+++ b/src/events/ThreeInARow.java
@@ -0,0 +1,10 @@
+package events;
+
+import board.IBoard;
+
+public class ThreeInARow extends InARow {
+    @Override
+    public boolean hasWon(int x, int y, IBoard board) {
+        return hasWon(x, y, board, 2);
+    }
+}
diff --git a/src/interfaces/FourInARowGUI.java b/src/interfaces/FourInARowGUI.java
new file mode 100644
index 0000000..8e008db
--- /dev/null
+++ b/src/interfaces/FourInARowGUI.java
@@ -0,0 +1,136 @@
+package interfaces;
+
+import board.IBoard;
+import objects.GameObject;
+import objects.Player;
+import objects.Token;
+
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+public class FourInARowGUI extends GUI {
+
+    public FourInARowGUI(int width, int height, IBoard board) {
+        if (width < 3 || height < 3 || height > 50 || width > 50) {
+            throw new IllegalArgumentException("Invalid game size.");
+        }
+        if (width != board.getWidth() || height != board.getHeight()) {
+            throw new IllegalArgumentException("The board does not match the gui.");
+        }
+        this.board = board;
+        for (int i = 0; i < 2; i++) {
+            String playerName = "";
+            while (playerName.equals("")) {
+                playerName = JOptionPane.showInputDialog(String.format("Name of player %d: ", i+1));
+                if (playerName == null) {
+                    System.exit(0);
+                }
+            }
+            Color color;
+            if (i == 0) {
+                color = Color.green;
+            } else {
+                color = Color.red;
+            }
+            Player player = new Player(playerName, color);
+            if (!this.board.addPlayer(player)) {
+                JOptionPane.showMessageDialog(null, "Player is not unique. Please try again.", "Error", JOptionPane.ERROR_MESSAGE);
+                i--;
+            }
+        }
+        initialize(width, height);
+    }
+
+    private void initialize(int width, int height) {
+        JFrame frame = new JFrame("Four in a row");
+        frame.addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowClosing(WindowEvent e) {
+                System.exit(0);
+            }
+        });
+        int fullWidth = BUTTON_WIDTH * width + (WIDTH_GAP + 1) * width;
+        int fullHeight = BUTTON_HEIGHT + (TILE_HEIGHT * height) + HEIGHT_GAP * (height) + TILE_HEIGHT;
+
+        this.frame = frame;
+        JPanel container = new JPanel();
+        container.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        container.setPreferredSize(new Dimension(fullWidth, fullHeight + TILE_HEIGHT + BUTTON_HEIGHT));
+        frame.add(container);
+
+        JPanel panel3 = new JPanel();
+        this.resetButton = new JButton("Reset");
+        this.resetButton.addActionListener(this);
+        panel3.add(this.resetButton);
+        for (Player player : board.getPlayers()) {
+            JLabel playerLabel = new JLabel(player.toString());
+            playerLabel.setForeground(player.getColor());
+            panel3.add(playerLabel);
+        }
+        container.add(panel3);
+
+        JPanel panel2 = new JPanel();
+        this.mainPanel = panel2;
+        panel2.setBackground(Color.BLUE);
+        panel2.setLayout(new FlowLayout(FlowLayout.CENTER, HEIGHT_GAP, WIDTH_GAP));
+        panel2.setPreferredSize(new Dimension(fullWidth, fullHeight));
+        dropButtons = new JButton[width];
+        for (int i = 0; i < width; i++) {
+            JButton button = new JButton();
+            button.addActionListener(this);
+            button.setPreferredSize(new Dimension(BUTTON_WIDTH, BUTTON_HEIGHT));
+            dropButtons[i] = button;
+            panel2.add(button, BorderLayout.PAGE_START);
+        }
+        tiles = new JTextPane[width * height];
+        readTiles();
+        container.add(panel2);
+
+        infoLabel = new JLabel();
+        infoLabel.setPreferredSize(new Dimension(fullWidth, BUTTON_HEIGHT));
+        infoLabel.setBorder(new EmptyBorder(10, 10, 10, 10));
+        container.add(infoLabel);
+
+        frame.validate();
+        frame.pack();
+        frame.setVisible(true);
+        this.currentPlayer = board.nextPlayer();
+        displayMessage("It's " + this.currentPlayer + "'s turn.");
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        if (e.getSource() == this.resetButton) {
+            this.board.flush();
+            displayBoard();
+            this.currentPlayer = this.board.nextPlayer();
+            displayMessage("It's " + this.currentPlayer + "'s turn.");
+        }
+        if (!(this.board.won() || this.board.isFull())) {
+            for (int i = 0; i < this.dropButtons.length; i++) {
+                if (e.getSource() == this.dropButtons[i]) {
+                    if (dropObject(i)) {
+                        displayBoard();
+                        if (!this.board.won()) {
+                            if (board.isFull()) {
+                                displayMessage("It's a draw");
+                            } else {
+                                this.currentPlayer = board.nextPlayer();
+                                displayMessage("It's " + this.currentPlayer + "'s turn.");
+                            }
+                        } else {
+                            GameObject winnerObject = this.board.get(i, this.board.getTopObject(i));
+                            displayMessage(((Token)winnerObject).getOwner() + " won.");
+                        }
+                    } else {
+                        displayMessage("That column is full.");
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/interfaces/GUI.java b/src/interfaces/GUI.java
new file mode 100644
index 0000000..a5ad078
--- /dev/null
+++ b/src/interfaces/GUI.java
@@ -0,0 +1,61 @@
+package interfaces;
+
+import board.IBoard;
+import objects.GameObject;
+import objects.Player;
+import objects.Token;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+
+public abstract class GUI implements ActionListener, IGameInterface {
+    final int BUTTON_HEIGHT = 25;
+    final int BUTTON_WIDTH = 50;
+    final int TILE_HEIGHT = 50;
+    final int HEIGHT_GAP = 10;
+    final int WIDTH_GAP = 10;
+
+    JButton[] dropButtons;
+    JButton resetButton;
+    JTextPane[] tiles;
+    JLabel infoLabel;
+    IBoard board;
+    JPanel mainPanel;
+    JFrame frame;
+
+    Player currentPlayer;
+
+    public void displayBoard() {
+        for (JTextPane pane : this.tiles) {
+            this.mainPanel.remove(pane);
+        }
+        this.tiles = new JTextPane[this.board.getWidth() * this.board.getHeight()];
+        readTiles();
+        this.frame.validate();
+    }
+
+    void readTiles() {
+        int k = 0;
+        for (int i = board.getHeight() - 1; i > -1; i--) {
+            for (int j = 0; j < board.getWidth(); j++) {
+                JTextPane textPane = new JTextPane();
+                this.tiles[k++] = textPane;
+                textPane.setEditable(false);
+                textPane.setBackground(Color.BLUE);
+                GameObject obj = board.get(j,i);
+                textPane.setBorder(BorderFactory.createLineBorder(obj.getColor(), 50, true));
+                textPane.setPreferredSize(new Dimension(BUTTON_WIDTH, TILE_HEIGHT));
+                mainPanel.add(textPane, BorderLayout.PAGE_START);
+            }
+        }
+    }
+
+    boolean dropObject(int i) {
+        return this.board.drop(i, new Token(currentPlayer));
+    }
+
+    public void displayMessage(String s) {
+        infoLabel.setText(s);
+    }
+}
diff --git a/src/interfaces/IGameInterface.java b/src/interfaces/IGameInterface.java
new file mode 100644
index 0000000..123bd64
--- /dev/null
+++ b/src/interfaces/IGameInterface.java
@@ -0,0 +1,6 @@
+package interfaces;
+
+interface IGameInterface {
+    void displayMessage(String s);
+    void displayBoard();
+}
diff --git a/src/interfaces/NInARowGUI.java b/src/interfaces/NInARowGUI.java
new file mode 100644
index 0000000..53bd83d
--- /dev/null
+++ b/src/interfaces/NInARowGUI.java
@@ -0,0 +1,181 @@
+package interfaces;
+
+import board.IBoard;
+import events.Block;
+import events.Bomb;
+import objects.GameObject;
+import objects.Player;
+import objects.Token;
+
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+public class NInARowGUI extends GUI {
+    private Bomb bomb = new Bomb();
+    private Block block = new Block();
+    private JLabel eventLabel;
+
+    public NInARowGUI(int width, int height, IBoard board) {
+        if (width < 3 || height < 3 || height > 50 || width > 50) {
+            throw new IllegalArgumentException("Invalid game size.");
+        }
+        if (width != board.getWidth() || height != board.getHeight()) {
+            throw new IllegalArgumentException("The board does not match the gui.");
+        }
+        this.board = board;
+        int playerNum = 0;
+        while (playerNum == 0) {
+            try {
+                String num = JOptionPane.showInputDialog("Number of players: ");
+                if (num == null) {
+                    System.exit(0);
+                }
+                playerNum = Integer.parseInt(num);
+                if (playerNum > width) {
+                    JOptionPane.showMessageDialog(null, "Number of players can't be higher than " + width, "Error", JOptionPane.ERROR_MESSAGE);
+                    playerNum = 0;
+
+                }
+            } catch (NumberFormatException e) {
+                JOptionPane.showMessageDialog(null, "Invalid input.", "Error", JOptionPane.ERROR_MESSAGE);
+            }
+        }
+        for (int i = 0; i < playerNum; i++) {
+            String playerName = "";
+            while (playerName.equals("")) {
+                playerName = JOptionPane.showInputDialog(String.format("Name of player %d: ", i+1));
+                if (playerName == null) {
+                    System.exit(0);
+                }
+            }
+            Color color = null;
+            while (color == null) {
+                color = JColorChooser.showDialog(null, "Choose a color", Color.RED);
+                if (color == null) {
+                    System.exit(0);
+                }
+                if (color == Color.lightGray || color == Color.blue || color == Color.black) {
+                    JOptionPane.showMessageDialog(null, "The chosen color is reserved. Please choose another color.", "Error", JOptionPane.ERROR_MESSAGE);
+                    color = null;
+                }
+            }
+            Player player = new Player(playerName, color);
+            if (!this.board.addPlayer(player)) {
+                JOptionPane.showMessageDialog(null, "Player is not unique. Please try again.", "Error", JOptionPane.ERROR_MESSAGE);
+                i--;
+            }
+        }
+        initialize(width, height);
+    }
+
+    private void initialize(int width, int height) {
+        JFrame frame = new JFrame("Four in a row");
+        frame.addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowClosing(WindowEvent e) {
+                System.exit(0);
+            }
+        });
+        int fullWidth = BUTTON_WIDTH * width + (WIDTH_GAP + 1) * width;
+        int fullHeight = BUTTON_HEIGHT + (TILE_HEIGHT * height) + HEIGHT_GAP * (height) + TILE_HEIGHT;
+
+        this.frame = frame;
+        JPanel container = new JPanel();
+        container.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        container.setPreferredSize(new Dimension(fullWidth, fullHeight + TILE_HEIGHT + 2 * BUTTON_HEIGHT));
+        frame.add(container);
+
+        JPanel panel3 = new JPanel();
+        this.resetButton = new JButton("Reset");
+        this.resetButton.addActionListener(this);
+        panel3.add(this.resetButton);
+        for (Player player : board.getPlayers()) {
+            JLabel playerLabel = new JLabel(player.toString());
+            playerLabel.setForeground(player.getColor());
+            panel3.add(playerLabel);
+        }
+        container.add(panel3);
+
+        JPanel panel2 = new JPanel();
+        this.mainPanel = panel2;
+        panel2.setBackground(Color.BLUE);
+        panel2.setLayout(new FlowLayout(FlowLayout.CENTER, HEIGHT_GAP, WIDTH_GAP));
+        panel2.setPreferredSize(new Dimension(fullWidth, fullHeight));
+        dropButtons = new JButton[width];
+        for (int i = 0; i < width; i++) {
+            JButton button = new JButton();
+            button.addActionListener(this);
+            button.setPreferredSize(new Dimension(BUTTON_WIDTH, BUTTON_HEIGHT));
+            dropButtons[i] = button;
+            panel2.add(button, BorderLayout.PAGE_START);
+        }
+        tiles = new JTextPane[width * height];
+        readTiles();
+        container.add(panel2);
+
+        infoLabel = new JLabel();
+        infoLabel.setPreferredSize(new Dimension(fullWidth, BUTTON_HEIGHT));
+        infoLabel.setBorder(new EmptyBorder(10, 10, 10, 10));
+        container.add(infoLabel);
+
+        eventLabel = new JLabel();
+        eventLabel.setPreferredSize(new Dimension(fullWidth, BUTTON_HEIGHT));
+        eventLabel.setBorder(new EmptyBorder(10, 10, 10, 10));
+        container.add(eventLabel);
+
+        frame.validate();
+        frame.pack();
+        frame.setVisible(true);
+        this.currentPlayer = board.nextPlayer();
+        displayMessage("It's " + this.currentPlayer + "'s turn.");
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        if (e.getSource() == this.resetButton) {
+            this.board.flush();
+            displayBoard();
+            this.currentPlayer = this.board.nextPlayer();
+            displayMessage("It's " + this.currentPlayer + "'s turn.");
+        }
+        if (!(this.board.won() || this.board.isFull())) {
+            for (int i = 0; i < this.dropButtons.length; i++) {
+                if (e.getSource() == this.dropButtons[i]) {
+                    if (dropObject(i)) {
+                        displayBoard();
+                        if (this.board.won()) {
+                            GameObject winnerObject = this.board.get(i, this.board.getTopObject(i));
+                            displayMessage(((Token)winnerObject).getOwner() + " won.");
+                        } else {
+                            triggerEvents();
+                            if (board.isFull()) {
+                                displayMessage("It's a draw");
+                            } else {
+                                this.currentPlayer = board.nextPlayer();
+                                displayMessage("It's " + this.currentPlayer + "'s turn.");
+                            }
+                        }
+                    } else {
+                        displayMessage("That column is full.");
+                    }
+                }
+            }
+        }
+    }
+
+    private void triggerEvents() {
+        if (bomb.rollDie(this.board, 2)) {
+            eventLabel.setText(bomb.announcement());
+            displayBoard();
+        } else if (block.rollDie(this.board, 1)) {
+            eventLabel.setText(block.announcement());
+            displayBoard();
+        } else {
+            eventLabel.setText("");
+        }
+    }
+}
diff --git a/src/interfaces/TicTacToeGUI.java b/src/interfaces/TicTacToeGUI.java
new file mode 100644
index 0000000..b38ebf3
--- /dev/null
+++ b/src/interfaces/TicTacToeGUI.java
@@ -0,0 +1,151 @@
+package interfaces;
+
+import board.Board;
+import events.IWinCondition;
+import events.ThreeInARow;
+import objects.Empty;
+import objects.GameObject;
+import objects.Player;
+import objects.Token;
+
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.ArrayList;
+import java.util.List;
+
+public class TicTacToeGUI extends GUI {
+    private JButton[] gameGrid = new JButton[9];
+
+    public TicTacToeGUI() {
+        List<IWinCondition> conditions = new ArrayList<>();
+        conditions.add(new ThreeInARow());
+        this.board = new Board(3,3, new Empty(), conditions);
+        int playerNum = 2;
+        for (int i = 0; i < playerNum; i++) {
+            String playerName = "";
+            while (playerName.equals("")) {
+                playerName = JOptionPane.showInputDialog(String.format("Name of player %d: ", i+1));
+                if (playerName == null) {
+                    System.exit(0);
+                }
+                if (playerName.length() > 10) {
+                    JOptionPane.showMessageDialog(null, "Player name can't be longer than 10 characters.", "Error", JOptionPane.ERROR_MESSAGE);
+                    playerName = "";
+                }
+            }
+            Player player;
+            if (i == 1) {
+                player = new Player(playerName, Color.BLACK);
+            } else {
+                player = new Player(playerName, Color.WHITE);
+            }
+            if (!this.board.addPlayer(player)) {
+                JOptionPane.showMessageDialog(null, "Player is not unique. Please try again.", "Error", JOptionPane.ERROR_MESSAGE);
+                i--;
+            }
+        }
+        initialize();
+    }
+
+    private void initialize() {
+        JFrame frame = new JFrame("Four in a row");
+        frame.addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowClosing(WindowEvent e) {
+                System.exit(0);
+            }
+        });
+        int fullWidth = (BUTTON_WIDTH) * 3;
+        int fullHeight = (TILE_HEIGHT) * 3;
+
+        this.frame = frame;
+        JPanel container = new JPanel();
+        container.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
+        container.setPreferredSize(new Dimension(fullWidth, fullHeight + 2 * BUTTON_HEIGHT));
+        frame.add(container);
+
+        JPanel panel2 = new JPanel();
+        this.mainPanel = panel2;
+        panel2.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
+        panel2.setPreferredSize(new Dimension(fullWidth, fullHeight));
+        readTiles();
+        container.add(panel2);
+
+        infoLabel = new JLabel();
+        infoLabel.setPreferredSize(new Dimension(fullWidth, 15));
+        infoLabel.setBorder(new EmptyBorder(10, 10, 15, 10));
+        container.add(infoLabel);
+        this.resetButton = new JButton("Reset");
+        this.resetButton.addActionListener(this);
+        container.add(this.resetButton);
+
+        frame.validate();
+        frame.pack();
+        frame.setVisible(true);
+        currentPlayer = board.nextPlayer();
+        displayMessage("It's " + currentPlayer + "'s turn.");
+    }
+
+    public void displayBoard() {
+        for (JButton button : this.gameGrid) {
+            this.mainPanel.remove(button);
+        }
+        this.gameGrid = new JButton[this.board.getWidth() * this.board.getHeight()];
+        readTiles();
+        this.frame.validate();
+    }
+
+    void readTiles() {
+        int k = 0;
+        for (int i = 0; i < board.getHeight(); i++) {
+            for (int j = 0; j < board.getWidth(); j++) {
+                JButton button = new JButton();
+                button.addActionListener(this);
+                GameObject obj = board.get(j,i);
+                if (obj.getColor() == Color.black) {
+                    button.setText("X");
+                } else if (obj.getColor() == Color.white) {
+                    button.setText("O");
+                }
+                button.setPreferredSize(new Dimension(BUTTON_WIDTH, TILE_HEIGHT));
+                this.gameGrid[k++] = button;
+                mainPanel.add(button, BorderLayout.PAGE_START);
+            }
+        }
+    }
+
+    public void actionPerformed(ActionEvent e) {
+        if (e.getSource() == this.resetButton) {
+            this.board.flush();
+            displayBoard();
+            this.currentPlayer = this.board.nextPlayer();
+            displayMessage("It's " + this.currentPlayer + "'s turn.");
+        }
+        if (!(board.won() || board.isFull())) {
+            for (int i = 0; i < this.gameGrid.length; i++) {
+                if (e.getSource() == this.gameGrid[i]) {
+                    if (this.gameGrid[i].getText().equals("")) {
+                        int x = i % 3;
+                        int y = i / 3;
+                        this.board.set(x, y, new Token(currentPlayer));
+                        displayBoard();
+                        if (!board.won()) {
+                            currentPlayer = board.nextPlayer();
+                            displayMessage("It's " + currentPlayer + "'s turn.");
+                        } else {
+                            GameObject winnerObject = board.get(x, board.getTopObject(x));
+                            displayMessage(((Token)winnerObject).getOwner() + " won.");
+                        }
+                        if (board.isFull()) {
+                            displayMessage("It's a draw");
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/objects/Empty.java b/src/objects/Empty.java
new file mode 100644
index 0000000..b614d4c
--- /dev/null
+++ b/src/objects/Empty.java
@@ -0,0 +1,3 @@
+package objects;
+
+public class Empty extends GameObject {}
diff --git a/src/objects/GameObject.java b/src/objects/GameObject.java
new file mode 100644
index 0000000..2da8c1c
--- /dev/null
+++ b/src/objects/GameObject.java
@@ -0,0 +1,11 @@
+package objects;
+
+import java.awt.*;
+
+public abstract class GameObject {
+    Color color = Color.LIGHT_GRAY;
+
+    public Color getColor() {
+        return color;
+    }
+}
diff --git a/src/objects/Immovable.java b/src/objects/Immovable.java
new file mode 100644
index 0000000..c9e14ae
--- /dev/null
+++ b/src/objects/Immovable.java
@@ -0,0 +1,9 @@
+package objects;
+
+import java.awt.*;
+
+public class Immovable extends GameObject {
+    public Immovable() {
+        this.color = Color.BLACK;
+    }
+}
diff --git a/src/objects/Player.java b/src/objects/Player.java
new file mode 100644
index 0000000..8637dd9
--- /dev/null
+++ b/src/objects/Player.java
@@ -0,0 +1,38 @@
+package objects;
+
+import java.awt.*;
+import java.util.Objects;
+
+public class Player {
+    private final String name;
+    private final Color color;
+
+    public Player(String name, Color color) {
+        this.name = name;
+        this.color = color;
+    }
+
+    public Color getColor() {
+        return color;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Player player = (Player) o;
+        return Objects.equals(name, player.name) ||
+                Objects.equals(color, player.color);
+    }
+
+    @Override
+    public int hashCode() {
+
+        return Objects.hash(name, color);
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}
diff --git a/src/objects/Token.java b/src/objects/Token.java
new file mode 100644
index 0000000..5887556
--- /dev/null
+++ b/src/objects/Token.java
@@ -0,0 +1,14 @@
+package objects;
+
+public class Token extends GameObject {
+    private final Player owner;
+
+    public Token(Player owner) {
+        this.owner = owner;
+        this.color = owner.getColor();
+    }
+
+    public Player getOwner() {
+        return this.owner;
+    }
+}
diff --git a/test/FourInARowTest.java b/test/FourInARowTest.java
new file mode 100644
index 0000000..aa192b2
--- /dev/null
+++ b/test/FourInARowTest.java
@@ -0,0 +1,63 @@
+import board.Board;
+import events.FourInARow;
+import events.IWinCondition;
+import objects.Empty;
+import objects.Player;
+import objects.Token;
+import org.junit.Test;
+
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class FourInARowTest {
+    private final List<IWinCondition> conditions = new ArrayList<>();
+
+    @Test
+    public void horisontalTest() {
+        conditions.add(new FourInARow());
+        Board board = new Board(4, 1, new Empty(), conditions);
+        Token token = new Token(new Player("Naem", Color.RED));
+        assertTrue(board.drop(0, token));
+        assertFalse(board.won());
+        assertTrue(board.drop(1, token));
+        assertFalse(board.won());
+        assertTrue(board.drop(2, token));
+        assertFalse(board.won());
+        assertTrue(board.drop(3, token));
+        assertTrue(board.won());
+    }
+
+    @Test
+    public void verticalTest() {
+        conditions.add(new FourInARow());
+        Board board = new Board(1, 4, new Empty(), conditions);
+        Token token = new Token(new Player("Naem", Color.RED));
+        assertTrue(board.drop(0, token));
+        assertFalse(board.won());
+        assertTrue(board.drop(0, token));
+        assertFalse(board.won());
+        assertTrue(board.drop(0, token));
+        assertFalse(board.won());
+        assertTrue(board.drop(0, token));
+        assertTrue(board.won());
+    }
+
+    @Test
+    public void diagonalTest() {
+        conditions.add(new FourInARow());
+        Board board = new Board(10, 10, new Empty(), conditions);
+        Token token = new Token(new Player("Naem", Color.RED));
+        board.set(0, 0, token);
+        assertFalse(board.won());
+        board.set(1, 1, token);
+        assertFalse(board.won());
+        board.set(2, 2, token);
+        assertFalse(board.won());
+        board.set(3, 3, token);
+        assertTrue(board.won());
+    }
+}
diff --git a/test/GridTest.java b/test/GridTest.java
new file mode 100644
index 0000000..3ec536c
--- /dev/null
+++ b/test/GridTest.java
@@ -0,0 +1,34 @@
+import static org.junit.Assert.*;
+
+import board.Grid;
+import objects.Empty;
+import objects.GameObject;
+import objects.Player;
+import objects.Token;
+import org.junit.Test;
+
+import java.awt.*;
+
+public class GridTest {
+    @Test
+    public void gridWidthTest() {
+        GameObject empty = new Empty();
+        Grid<GameObject> grid = new Grid<>(10, 11, empty);
+        assertEquals(10, grid.getWidth());
+    }
+
+    @Test
+    public void gridHeightTest() {
+        GameObject empty = new Empty();
+        Grid<GameObject> grid = new Grid<>(10, 11, empty);
+        assertEquals(11, grid.getHeight());
+    }
+
+    @Test
+    public void gridSetGetTest() {
+        GameObject empty = new Empty();
+        Grid<GameObject> grid = new Grid<>(10, 11, empty);
+        Token token = new Token(new Player("Naem", Color.green));
+        grid.set(7, 3, token);
+        assertEquals(token, grid.get(7, 3));
+    }}
diff --git a/test/TicTacToeTest.java b/test/TicTacToeTest.java
new file mode 100644
index 0000000..50e5ee1
--- /dev/null
+++ b/test/TicTacToeTest.java
@@ -0,0 +1,82 @@
+import board.Board;
+import events.IWinCondition;
+import events.ThreeInARow;
+import objects.Empty;
+import objects.Player;
+import objects.Token;
+import org.junit.Test;
+
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class TicTacToeTest {
+    private final List<IWinCondition> conditions = new ArrayList<>();
+
+    @Test
+    public void horisontalTest() {
+        conditions.add(new ThreeInARow());
+        Board board = new Board(3, 3, new Empty(), conditions);
+        Token token = new Token(new Player("Naem", Color.WHITE));
+        board.set(0, 0, token);
+        board.set(1, 0, token);
+        board.set(2, 0, token);
+        assertTrue(board.won());
+        board = new Board(3, 3, new Empty(), conditions);
+        board.set(0, 1, token);
+        board.set(1, 1, token);
+        board.set(2, 1, token);
+        assertTrue(board.won());
+        board = new Board(3, 3, new Empty(), conditions);
+        board.set(0, 2, token);
+        board.set(1, 2, token);
+        board.set(2, 2, token);
+        assertTrue(board.won());
+    }
+
+    @Test
+    public void verticalTest() {
+        conditions.add(new ThreeInARow());
+        Board board = new Board(3, 3, new Empty(), conditions);
+        Token token = new Token(new Player("Naem", Color.WHITE));
+        board.set(0, 0, token);
+        assertFalse(board.won());
+        board.set(0, 1, token);
+        assertFalse(board.won());
+        board.set(0, 2, token);
+        assertTrue(board.won());
+        board = new Board(3, 3, new Empty(), conditions);
+        board.set(1, 0, token);
+        board.set(1, 1, token);
+        board.set(1, 2, token);
+        assertTrue(board.won());
+        board = new Board(3, 3, new Empty(), conditions);
+        board.set(2, 0, token);
+        board.set(2, 1, token);
+        board.set(2, 2, token);
+        assertTrue(board.won());
+    }
+
+    @Test
+    public void diagonalTest() {
+        conditions.add(new ThreeInARow());
+        Board board = new Board(3, 3, new Empty(), conditions);
+        Token token = new Token(new Player("Naem", Color.WHITE));
+        board.set(0, 0, token);
+        assertFalse(board.won());
+        board.set(1, 1, token);
+        assertFalse(board.won());
+        board.set(2, 2, token);
+        assertTrue(board.won());
+        board = new Board(3, 3, new Empty(), conditions);
+        board.set(0, 2, token);
+        assertFalse(board.won());
+        board.set(1, 1, token);
+        assertFalse(board.won());
+        board.set(2, 0, token);
+        assertTrue(board.won());
+    }
+}