diff --git a/Colours.java b/Colours.java
index 4e75759..1f16b6a 100644
--- a/Colours.java
+++ b/Colours.java
@@ -1,7 +1,7 @@
 import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
 
 /**
- * Write a description of class Colours here.
+ * Write a description of class Colors here.
  * 
  * @author (your name) 
  * @version (a version number or a date)
@@ -15,9 +15,9 @@ public class Colours extends World implements ButtonEvent
 	Button lila = new Button ("Lila", 16, this);
 	Button gelb = new Button ("Gelb", 16, this);
 	Button weiter = new Button ("Weiter", 16, this);
-	int [] colour = new int [6];
+	int [] color = new int [6];
 	String [] pn = new String [6];
-	int x;
+	int x = 0;
 	boolean possw = true;
 	boolean posbl = true;
 	boolean posgr = true;
@@ -32,18 +32,20 @@ public class Colours extends World implements ButtonEvent
 	int li = 6;
    
 	/**
-	 * Constructor for objects of class Colours.
+	 * Constructor for objects of class Colors.
 	 * 
 	 */
-	public Colours()
+	public Colours(int x, int y, int z)
 	{    
-		super(1600, 900, 1); 
+	    
+		super(x, y, z); 
 		addObject(schwarz, 10, 10);
-		addObject ( blau, 25, 10);
-		addObject ( grün, 40, 10);
-		addObject ( rot, 55, 10);
-		addObject(gelb, 70, 10);
-		addObject(lila, 85, 10);
+		addObject ( blau, 35, 10);
+		addObject ( grün, 55, 10);
+		addObject ( rot, 75, 10);
+		addObject(gelb, 100, 10);
+		addObject(lila, 125, 10);
+		addObject (weiter, 200,10);
 		
 	}
 	// Überprüft, ob ein Farbbutton geklickt wurde
@@ -58,50 +60,57 @@ public class Colours extends World implements ButtonEvent
 	{
 		if ( b == schwarz && possw == true)
 		{
-			colour [x] = sw;
+			color [x] = sw;
 			pn[x]="Schwarz";
 			x+=1;
 			possw = false;
 		}
 		if (b == blau && posbl == true)
 		{
-			colour[x] = bl;
+			color[x] = bl;
 			pn[x] = "Blau";
 			x+=1;
 			posbl = false; 
 		}
 		if (b == grün && posgr == true )
 		{
-			colour[x] = gr;
+			color[x] = gr;
 			pn[x]="Grün";
 			x+=1;
 			posgr = false;
 		}
 		if ( b == rot && posrt == true)
 		{
-			colour[x] = rt;
+			color[x] = rt;
 			pn[x]="Rot";
 			x+=1;
 			posrt = false;
 		}
 		if ( b == gelb && posgb == true)
 		{
-			colour [x] = gb;
+			color [x] = gb;
 			pn[x]="Gelb";
 			x+=1;
 			posgb = false;
 		}
 		if ( b == lila && posli == true)
 		{
-			colour [x] = li;
+			color [x] = li;
 			pn[x]="Lila";
 			x+=1;
 			posli = false;
 		}
-		if ( b == weiter && x >1)
+		if ( b == weiter && x >=2 )
 		{
-			Map m = new Map(colour, x, pn);
-			//setWorld(m);
+		    String[] newpn = new String[x];
+		    int[] newcolor = new int[x];
+		    for (int i = 0; i< x; i++)
+		    {
+		        newpn[i] = pn[i];
+		        newcolor[i] = color[i];
+		      }
+			World m = new Map(newcolor, x,newpn);
+			Greenfoot.setWorld(m);
 		}
 	}
    
diff --git a/Map.java b/Map.java
index e5e8273..bbc56b2 100644
--- a/Map.java
+++ b/Map.java
@@ -6,7 +6,7 @@ import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
  * @author (your name) 
  * @version (a version number or a date)
  */
-public class Map implements ButtonEvent
+public class Map extends World implements ButtonEvent
 {
     private Button map1 = new Button ("map1",16,this);
     private Button map2 = new Button ("map2",16,this);
@@ -17,21 +17,27 @@ public class Map implements ButtonEvent
     //private int x;
     //private int y;
     private int m=0;
-    private GeneralMap GM ;
-    
+    private Map_World MW ;
+    // int [] newcolour = new int [pnu];
+    // String [] newpn = new String [pnu];
     public Map( int [] bunt, int zahl , String [] name)
     {
-        super(1600, 900, 1);
-        
-        for (int i=0; i<6; i++)
+
+        super (1600,900,1);
+        for (int i=0; i<pnu; i++)
         {
             colour[i] = bunt[i];
             pn[i] = name[i];
         }
-        pnu = zahl;
+        pnu=zahl;
         addObject(map1, (1600-map1.getWidth())/2, (900-map1.getHeight())/2);
         addObject(map2, ((1600-map2.getWidth())/2)-25, ((900-map1.getHeight())/2)+75);
         addObject(fertigst, (1600-fertigst.getWidth()), 900-fertigst.getWidth());
+        // for ( int i=0; i<=pnu; i++)
+        // {
+            // newpn[i] = pn[i];
+            // newcolour[i] = colour[i];
+        // }
     } 
     // Die Map Buttons geben der Variable m einen Wert
     public void buttonClicked(Button b)
@@ -41,17 +47,21 @@ public class Map implements ButtonEvent
             //x= ;
             //y= ;
             m =1;
-            
+
         }
         if (b== map2)
         {
             m =2;
-            
+
         }
         if (b == fertigst)
         {
-            //new GeneralMap(colour, pnu, pn, m);
-            Greenfoot.setWorld(GM);
+            if (m==1)
+            {
+                GeneralMap m = new Map_World (pn, colour);
+                Greenfoot.setWorld(m);
+            }
+
         }
     }
 
diff --git a/Start_Load.java b/Start_Load.java
index 97516e4..e2e39a8 100644
--- a/Start_Load.java
+++ b/Start_Load.java
@@ -6,29 +6,33 @@ import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
  * @author 4ngelica 
  * @version 1.0
  */
-public class Start_Load extends World implements ButtonEvent
+public class Start_Load extends World implements ButtonEvent 
 {
-    Button start = new Button ("new game", 16, this);
+     Button chulien = new Button("Neues Spiel", 16 , this);
+     
     /**
      * Constructor for objects of class Start_Load.
      * 
      */
     public Start_Load()
     {    
+        // Create a new world with 600x400 cells with a cell size of 1x1 pixels.
         super(1600, 900, 1); 
-        addObject (start, 800, 450);
-        
+        addObject (chulien, (1600-chulien.getWidth())/2, (900-chulien.getHeight())/2);
 	}
-	
-	public void buttonClicked (Button b)
+	public void buttonClicked ( Button b)
 	{
-	    if (Greenfoot.mouseClicked(this))    
-		{    
-			Greenfoot.setWorld(new Colours());  
-		}
+	    
+	   if ( b  == chulien)
+	   {
+	       World chean = new Colours (1600, 900, 1);
+	       Greenfoot.setWorld(chean);
+	       
+	   }
 	}
 	
-	public void Load() //hat noch keine Funktion
+	
+	public void Load()
 	{
 	    
 	}