diff --git a/.idea/hellsgamers.iml b/.idea/hellsgamers.iml
index dc096b4..72c76be 100644
--- a/.idea/hellsgamers.iml
+++ b/.idea/hellsgamers.iml
@@ -6,9 +6,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/test_" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/test_/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test_/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test_/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/src/main/java/PingPong/GamePanel.java b/src/main/java/PingPong/GamePanel.java
index 47662f6..4b4db89 100644
--- a/src/main/java/PingPong/GamePanel.java
+++ b/src/main/java/PingPong/GamePanel.java
@@ -22,6 +22,22 @@ public class GamePanel extends JPanel implements Runnable {
     Score score;
     Image image;
     Graphics graphics;
+    CollisionChecker collisionChecker;
+    Thread gameThread;
+
+
+    public GamePanel() {
+        newPeddle();
+        newBall();
+        score = new Score(FRAME_WIDTH, FRAME_HEIGHT);
+        collisionChecker = new CollisionChecker();
+        this.setFocusable(true);
+        this.addKeyListener(new AL());
+        this.setPreferredSize(SCREEN);
+
+        gameThread = new Thread(this);
+        gameThread.start();
+    }
 
 
 
diff --git a/src/test/java/AIGridGUITest.java b/src/test_/java/AIGridGUITest.java
similarity index 100%
rename from src/test/java/AIGridGUITest.java
rename to src/test_/java/AIGridGUITest.java
diff --git a/target/classes/classpath.index b/target/classes/classpath.index
deleted file mode 100644
index 674a749..0000000
Binary files a/target/classes/classpath.index and /dev/null differ
diff --git a/target/hellsgamers-1.0-SNAPSHOT.jar b/target/hellsgamers-1.0-SNAPSHOT.jar
index 4191a55..ea3a279 100644
Binary files a/target/hellsgamers-1.0-SNAPSHOT.jar and b/target/hellsgamers-1.0-SNAPSHOT.jar differ
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
index 22f93c5..e6bd5fe 100644
--- a/target/maven-archiver/pom.properties
+++ b/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Feb 07 11:52:01 CET 2023
+#Wed Feb 08 20:10:52 CET 2023
 groupId=Hellsgamers
 artifactId=hellsgamers
 version=1.0-SNAPSHOT
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 2f632ce..3ecedd5 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -2,10 +2,12 @@ MenuPanel.class
 PingPong\Score.class
 BattleShip\BSButton.class
 Snake\Window.class
+PingPong\GamePanel$AL.class
 Snake\Controller$1.class
 MenuPanel$GameFrame.class
 BattleShip\Ship.class
 PingPong\Ball.class
+BattleShip\BShip$NewGameListener.class
 Snake\TextView$AnchorType.class
 BattleShip\AIGridGUI$SetShipsListener.class
 MenuPanel$AL.class
@@ -22,8 +24,10 @@ Snake\SnakeView.class
 Snake\AppleView.class
 Snake\Controller$3.class
 Snake\TextView.class
+BattleShip\GridGUI$MyCellListener.class
 BattleShip\BShip.class
 PingPong\GamePanel.class
+PingPong\CollisionChecker.class
 Snake\Controller$MoveAction.class
 Snake\Snake$1.class
 Snake\Apple.class
@@ -33,3 +37,4 @@ Snake\Drawable.class
 Snake\Controller$2.class
 MenuFrame.class
 Snake\GameView.class
+BattleShip\GridGUI.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 39e231f..32ad707 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,3 +1,12 @@
+C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\BShip.java
+C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Main.java
+C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\BSButton.java
+C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\SnakeView.java
+C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Apple.java
+C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Game.java
+C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\Ship.java
+C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\PingPong\GameFrame.java
+C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Window.java
 C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\MenuPanel.java
 C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\AIGridGUI.java
 C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\AppleView.java
@@ -5,19 +14,12 @@ C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\PingPong\Paddle.java
 C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\MenuFrame.java
 C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\Direction.java
 C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Controller.java
-C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\BShip.java
 C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\PingPong\GamePanel.java
-C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Main.java
 C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\PingPong\Score.java
 C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Snake.java
 C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\GameView.java
+C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\PingPong\CollisionChecker.java
 C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Drawable.java
-C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\BSButton.java
-C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\SnakeView.java
-C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Apple.java
-C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Game.java
+C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\GridGUI.java
 C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\TextView.java
-C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\BattleShip\Ship.java
-C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\PingPong\GameFrame.java
-C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\Snake\Window.java
 C:\Users\Laura\IdeaProjects\hellsgamers\src\main\java\PingPong\Ball.java
diff --git a/target/test-classes/AIGridGUITest.class b/target/test-classes/AIGridGUITest.class
index cc50bad..073325f 100644
Binary files a/target/test-classes/AIGridGUITest.class and b/target/test-classes/AIGridGUITest.class differ
diff --git a/target/test-classes/classpath.index b/target/test-classes/classpath.index
deleted file mode 100644
index cdfba22..0000000
Binary files a/target/test-classes/classpath.index and /dev/null differ