diff --git a/GameState.py b/GameState.py
index 19b3243..550c1f5 100644
--- a/GameState.py
+++ b/GameState.py
@@ -8,7 +8,7 @@ class GameState:
 
     @property
     def currentPlayer(self):
-        return self.players[self.currentPlayerID]
+        return self.players[0]
 
     @currentPlayer.setter
     def currentPlayer(self, playerId):
@@ -21,3 +21,5 @@ class GameState:
         self.players[0] = next(filter(lambda x: playerId == x.id, self.players))
         self.players.remove(savedPlayer)
         self.players.append(savedPlayer)
+
+        self.currentPlayer.activate()
diff --git a/factories/GameFactory.py b/factories/GameFactory.py
index b1cf0fc..796eb3d 100644
--- a/factories/GameFactory.py
+++ b/factories/GameFactory.py
@@ -29,7 +29,7 @@ class GameFactory:
         players = self.createPlayers()
 
         banks = [targets['Left Bank'], targets['Right Bank'], targets['Top Bank']]
-        gameState = GameState(players, self.getHighScore(), players[0].id)
+        gameState = GameState(players, self.getHighScore(), players[0].id, banks)
 
         eventFactory = EventFactory(targets, gameState.currentPlayer)
         events = eventFactory.allEvents()