diff --git a/out/production/Tetris/Tetris/GameGui.class b/out/production/Tetris/Tetris/GameGui.class
index e36b369..d445ac2 100644
Binary files a/out/production/Tetris/Tetris/GameGui.class and b/out/production/Tetris/Tetris/GameGui.class differ
diff --git a/src/Tetris/Game.java b/src/Tetris/Game.java
new file mode 100644
index 0000000..8cb0957
--- /dev/null
+++ b/src/Tetris/Game.java
@@ -0,0 +1,24 @@
+package Tetris;
+
+import javax.swing.*;
+
+public class Game {
+    public static void main(String[] args) {
+        Menue menue = new Menue();
+
+        menue.getButton().addActionListener(new java.awt.event.ActionListener() {
+            @Override
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                String name = JOptionPane.showInputDialog(menue.getParent(),
+                        "What is your name?", null);
+                if(name == null){
+                    name = "anon";
+                }
+                menue.getParent().setVisible(false);
+                new GameGui(name);
+            }
+        });
+        //String playername = menue.getName();
+        //new GameGui(playername);
+    }
+}
diff --git a/src/Tetris/GameGui.java b/src/Tetris/GameGui.java
index b9e9eda..cbc3a3b 100644
--- a/src/Tetris/GameGui.java
+++ b/src/Tetris/GameGui.java
@@ -8,8 +8,8 @@ public class GameGui {
     private JFrame frame;
 
     //Zhe Wang-Holkenbrink
-    public GameGui(){
-        frame = new JFrame("Tetris");
+    public GameGui(String playername){
+        frame = new JFrame("Tetris " + playername);
         JPanel panel = new JPanel();
         panel.setBorder(BorderFactory.createMatteBorder(500, 10, 10, 50,Color.black));
 
@@ -50,6 +50,6 @@ public class GameGui {
     }
     public static void main(String [] args)
     {
-        new GameGui();
+
     }
 }
diff --git a/src/Tetris/Menue.java b/src/Tetris/Menue.java
index a28d487..dd9d2fa 100644
--- a/src/Tetris/Menue.java
+++ b/src/Tetris/Menue.java
@@ -7,9 +7,42 @@ import java.awt.*;
 
 public class Menue {
 
+    private String name;
+
+    private JFrame parent;
+
+    public JFrame getParent() {
+        return parent;
+    }
+
+    public void setParent(JFrame parent) {
+        this.parent = parent;
+    }
+
+    private JButton button;
+
+    public JButton getButton() {
+        return button;
+    }
+
+    public void setButton(JButton button) {
+        this.button = button;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+
+
     public Menue(){
-        JFrame parent = new JFrame("Tetris Menü");
-        JButton button = new JButton();
+
+        parent = new JFrame("Tetris Menü");
+        button = new JButton();
 
         button.setText("Namen Eingeben");
         button.setPreferredSize(new Dimension(400,500));
@@ -18,13 +51,6 @@ public class Menue {
         parent.pack();
         parent.setVisible(true);
 
-        button.addActionListener(new java.awt.event.ActionListener() {
-            @Override
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                String name = JOptionPane.showInputDialog(parent,
-                        "What is your name?", null);
-            }
-        });
     }
     public static void main(final String[] args) {
         new Menue();