diff --git a/HeatUp/src/de/heatup/highscore/HighscoreHandler.java b/HeatUp/src/de/heatup/highscore/HighscoreHandler.java
index 4373422..befd54a 100644
--- a/HeatUp/src/de/heatup/highscore/HighscoreHandler.java
+++ b/HeatUp/src/de/heatup/highscore/HighscoreHandler.java
@@ -12,7 +12,11 @@ import com.sun.org.apache.xml.internal.serializer.SerializationHandler;
 
 import de.heatup.cfg.Config;
 import de.heatup.logging.Logger;
-
+/**
+ * 
+ * @author daniel
+ *
+ */
 public class HighscoreHandler {
 	private int mapHash;
 	private MapHighscores mapHighscores;
diff --git a/HeatUp/src/de/heatup/highscore/MapHighscores.java b/HeatUp/src/de/heatup/highscore/MapHighscores.java
index 27c66ba..14d0ef3 100644
--- a/HeatUp/src/de/heatup/highscore/MapHighscores.java
+++ b/HeatUp/src/de/heatup/highscore/MapHighscores.java
@@ -4,7 +4,11 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-
+/**
+ * 
+ * @author daniel
+ *
+ */
 public class MapHighscores implements Serializable {
 	
 	private static final long serialVersionUID = 1L;
diff --git a/HeatUp/src/de/heatup/ui/Main.java b/HeatUp/src/de/heatup/ui/Main.java
index c912901..197dd77 100644
--- a/HeatUp/src/de/heatup/ui/Main.java
+++ b/HeatUp/src/de/heatup/ui/Main.java
@@ -108,7 +108,7 @@ public class Main extends JFrame implements Runnable {
 		/*
 		 * entfernen wenn getter verwendet wird.
 		 */
-		player01 = PanelBuilder.player01;
+		player01 = PanelBuilder.getPlayer();
 
 		
 		/*
@@ -170,7 +170,7 @@ public class Main extends JFrame implements Runnable {
 	}
 	
 	public static Player getPlayer() {
-		return PanelBuilder.player01;
+		return PanelBuilder.getPlayer();
 	}
 	
 	public synchronized void start() {
@@ -243,38 +243,7 @@ public class Main extends JFrame implements Runnable {
 	private void tick() {
 		PanelBuilder.kb.checkKeyActivity();
 		if (!pause) {
-			EventQueue.invokeLater(new Runnable() {
-				@Override public void run() {
-					ActionWatcher.tick();
-				}
-			});
-			EventQueue.invokeLater(new Runnable() {
-				@Override public void run() {
-					ActionControl.tick();
-				}
-			});
-			EventQueue.invokeLater(new Runnable() {
-				@Override public void run() {
-					HardwareResetTimers.tick();
-				}
-			});
-			for (final Player object : PanelBuilder.getInstancedObjects().getObjects()) {
-				EventQueue.invokeLater(new Runnable() {
-					@Override public void run() {
-						object.tick();
-					}
-				});
-			}
-			EventQueue.invokeLater(new Runnable() {
-				@Override public void run() {
-					CollisionHandler.tick();
-				}
-			});
-			EventQueue.invokeLater(new Runnable() {
-				@Override public void run() {
-					StatusPanelAdder.tick();
-				}
-			});
+			PanelBuilder.tick();
 		}
 	}
 	// alles was animiert wird hier rein (paints)
diff --git a/HeatUp/src/de/heatup/ui/PanelBuilder.java b/HeatUp/src/de/heatup/ui/PanelBuilder.java
index 966b70c..7f74c45 100644
--- a/HeatUp/src/de/heatup/ui/PanelBuilder.java
+++ b/HeatUp/src/de/heatup/ui/PanelBuilder.java
@@ -1,18 +1,23 @@
 package de.heatup.ui;
 
+import java.awt.EventQueue;
 import java.awt.Point;
+import java.util.ArrayList;
 
 import javax.swing.JPanel;
 
 import de.heatup.highscore.ScoreEntry;
 import de.heatup.logging.Logger;
+import de.heatup.mapengine.CollisionHandler;
 import de.heatup.mapengine.MapEngine;
 import de.heatup.mapengine.SpawnAssistant;
 import de.heatup.objects.ImageLoader;
 import de.heatup.objects.InstancedObjects;
 import de.heatup.objects.Opponent;
 import de.heatup.objects.Player;
+import de.heatup.timers.HardwareResetTimers;
 import de.heatup.ui.actionPanel.ActionControl;
+import de.heatup.ui.actionPanel.ActionWatcher;
 
 public class PanelBuilder {
 	private static JPanel actionPanel;
@@ -22,18 +27,67 @@ public class PanelBuilder {
 	
 	public static KeyBindings kb;
 	
-	public static Player player01;
+	private static Player player01;
 	
 	private static InstancedObjects instancedObjects;
 	private static ImageLoader imageLoader;
 	
+	private static int gameState = 2; /* 1=menu; 2=game running */
+	private static boolean gameLoaded = false;
+	
 	public static InstancedObjects getInstancedObjects() {
 		return instancedObjects;
 	}
-
-	public static void tick() {
+	public static Player getPlayer() {
+		return player01;
+	}
+	public static void toMenu() {
 		
 	}
+	public static void tick() {
+		switch (gameState) {
+		case 1:
+			Logger.write("Menu tick");
+			break;
+		case 2:
+			EventQueue.invokeLater(new Runnable() {
+				@Override public void run() {
+					ActionWatcher.tick();
+				}
+			});
+			EventQueue.invokeLater(new Runnable() {
+				@Override public void run() {
+					ActionControl.tick();
+				}
+			});
+			EventQueue.invokeLater(new Runnable() {
+				@Override public void run() {
+					HardwareResetTimers.tick();
+				}
+			});
+			for (final Player object : PanelBuilder.getInstancedObjects().getObjects()) {
+				EventQueue.invokeLater(new Runnable() {
+					@Override public void run() {
+						object.tick();
+					}
+				});
+			}
+			EventQueue.invokeLater(new Runnable() {
+				@Override public void run() {
+					CollisionHandler.tick();
+				}
+			});
+			EventQueue.invokeLater(new Runnable() {
+				@Override public void run() {
+					StatusPanelAdder.tick();
+				}
+			});
+			break;
+		default:
+			Logger.write("Invalid gameState");
+			System.exit(-1);
+		}
+	}
 
 	public static void setPanels(JPanel actionPanel, JPanel outerPanel, JPanel statusPanel, JPanel gamePanel) {
 		PanelBuilder.actionPanel = actionPanel;
@@ -108,7 +162,8 @@ public class PanelBuilder {
 			movingObject.spawnAt(spawnPoint);
 		}
 
-
+		gameLoaded = true;
+		
 	}
 
 	public static ImageLoader getImageLoader() {