diff --git a/src/ch/zhaw/catan/SiedlerGame.java b/src/ch/zhaw/catan/SiedlerGame.java
index 4ce4675..4ab205d 100644
--- a/src/ch/zhaw/catan/SiedlerGame.java
+++ b/src/ch/zhaw/catan/SiedlerGame.java
@@ -59,6 +59,12 @@ public class SiedlerGame {
      */
     public void switchToNextPlayer() {
         // TODO: Implement
+        if (activePlayer < allPlayers.size()){
+            activePlayer++;
+        }
+        else if (activePlayer == allPlayers.size()){
+            activePlayer = 0;
+        }
     }
 
     /**
@@ -66,6 +72,12 @@ public class SiedlerGame {
      */
     public void switchToPreviousPlayer() {
         // TODO: Implement
+        if (activePlayer > 0){
+            activePlayer--;
+        }
+        else if (activePlayer == 0){
+            activePlayer = allPlayers.size()-1;
+        }
     }
 
     /**