diff --git a/core/assets/square2.png b/core/assets/square2.png
index 70d3648..155f96c 100644
Binary files a/core/assets/square2.png and b/core/assets/square2.png differ
diff --git a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
index d9cc7e7..58954d6 100644
--- a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
+++ b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
@@ -157,9 +157,11 @@ public class GameInputProcessor implements InputProcessor {
                             }
                             if (!mainGame.hasCharacterSelected() && gameTile.containsCharacter()) {
                                 mainGame.setSelectedCharacter(gameTile.getCharacter());
+                                mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col,row);
                             }
                             if (gameTile.containsCharacter() && !mainGame.getSelectedCharacter().equals(gameTile.getCharacter())) {
                                 mainGame.setSelectedCharacter(gameTile.getCharacter());
+                                mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col,row);
                             }
                             return true;
                         }
diff --git a/core/src/netwerkprog/game/client/game/map/MapRenderer.java b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
index 453dcf1..0d818b9 100644
--- a/core/src/netwerkprog/game/client/game/map/MapRenderer.java
+++ b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
@@ -7,6 +7,7 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import netwerkprog.game.client.MainGame;
+import netwerkprog.game.util.game.GameCharacter;
 import netwerkprog.game.util.graphics.Renderable;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 
@@ -144,12 +145,14 @@ public class MapRenderer implements Renderable {
             int cy = y + direction[1];
             if (cy >= 0 && cy < gameTiles.length)
                 if (cx >= 0 && cx < gameTiles[cy].length)
-                    res.add(gameTiles[cy][cx]);
+                    if (gameTiles[cy][cx].getSymbol() != '#')
+                        res.add(gameTiles[cy][cx]);
         }
         surroundedTilesOfCurrentCharacter = res;
         return res;
     }
 
+
     public int getPos(GameTile tile, String choice) {
         for (int row = 0; row < this.gameTiles.length; row++) {
             for (int col = 0; col < this.gameTiles[0].length; col++) {
diff --git a/core/src/netwerkprog/game/util/game/GameCharacter.java b/core/src/netwerkprog/game/util/game/GameCharacter.java
index db91787..576c92d 100644
--- a/core/src/netwerkprog/game/util/game/GameCharacter.java
+++ b/core/src/netwerkprog/game/util/game/GameCharacter.java
@@ -5,10 +5,13 @@ import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.scenes.scene2d.Actor;
+import netwerkprog.game.client.game.map.GameTile;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 
+import java.util.List;
 import java.util.Objects;
 
 public abstract class GameCharacter extends Actor implements Comparable<GameCharacter> {
@@ -18,6 +21,7 @@ public abstract class GameCharacter extends Actor implements Comparable<GameChar
     protected boolean override;
     protected TextureRegion textureRegion;
     protected int health;
+    protected List<GameTile> allowedToMove;
 
     public GameCharacter(String name, Faction faction, TextureRegion textureRegion, Ability... abilities) {
         super();
@@ -27,6 +31,7 @@ public abstract class GameCharacter extends Actor implements Comparable<GameChar
         this.override = false;
         this.textureRegion = textureRegion;
         this.health = 100;
+        this.allowedToMove = new ArrayList<>();
     }
 
     public String getName() {
@@ -106,4 +111,12 @@ public abstract class GameCharacter extends Actor implements Comparable<GameChar
                 ", y=" + super.getY() +
                 '}';
     }
+
+    public List<GameTile> getAllowedToMove() {
+        return allowedToMove;
+    }
+
+    public void setAllowedToMove(List<GameTile> allowedToMove) {
+        this.allowedToMove = allowedToMove;
+    }
 }