diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 9784cb2..4e2662a 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -2,13 +2,13 @@
 #include "../Environment/Maze.h"
 
 namespace game {
-    Entity::Entity(PositionVector starting_position, char display_character): pos(starting_position), display_character(display_character), move_left(true){}
+    Entity::Entity(const Vector2d starting_position, const char display_character): pos(starting_position), display_character(display_character), move_left(true){}
 
-    bool Entity::is_at_position(const PositionVector& position) const {
+    bool Entity::is_at_position(const Vector2d& position) const {
         return this->pos.eq(position);
     }
 
-    void Entity::tick(Maze& maze, const PositionVector& player_position){
+    void Entity::tick(const Maze& maze, const Vector2d& player_position){
         switch (this->display_character) {
             case 'A':
                 // No thoughts, head empty :P
@@ -20,12 +20,14 @@ namespace game {
                 this->handle_connelly(maze, player_position);
                 return;
             default:
+                cout << "ERR: THIS IS NOT A GHOST!";
+            /// This case will never happen
                 return;
         }
     }
 
-    void Entity::handle_bowie(Maze& maze) {
-        PositionVector target_position = {this->pos.x, this->pos.y};
+    void Entity::handle_bowie(const Maze& maze) {
+        Vector2d target_position = this->pos;
         if (this->move_left)
             target_position.change_x(-1);
         else
@@ -36,14 +38,67 @@ namespace game {
             this->move_left = !this->move_left;
     }
 
-    void Entity::handle_connelly(Maze& maze, const PositionVector& player_position) {
-        PositionVector diff = maze.get_distance_pos1_pos2(player_position, this->pos);
-        PositionVector normalized_diff = {diff.x, diff.y};
-        normalized_diff.normalize();
-        PositionVector target_position = {this->pos.x, this->pos.y};
+    bool Entity::connelly_move_up(const Maze& maze) {
+        Vector2d top = this->pos.get_new_updated(0, 1);
+        if (maze.is_pos_free(top, false)) {
+            this->pos = top;
+            return true;
+        }
+        return false;
     }
 
-    char Entity::get_display_character() {
+    bool Entity::connelly_move_down(const Maze& maze) {
+        Vector2d bottom = this->pos.get_new_updated(0, -1);
+        if (maze.is_pos_free(bottom, false)) {
+            this-> pos = bottom;
+            return true;
+        }
+        return false;
+    }
+
+    bool Entity::connelly_move_left(const Maze& maze) {
+        Vector2d left = this->pos.get_new_updated(-1, 0);
+        if (maze.is_pos_free(left, false)) {
+            this->pos = left;
+            return true;
+        }
+        return false;
+    }
+
+    bool Entity::connelly_move_right(const Maze& maze) {
+        Vector2d right = this->pos.get_new_updated(1, 0);
+        if (maze.is_pos_free(right, false)) {
+            this->pos = right;
+            return true;
+        }
+        return false;
+    }
+
+    void Entity::handle_connelly(const Maze& maze, const Vector2d& player_position) {
+        Vector2d diff = maze.get_delta_vector(player_position, this->pos);
+        Vector2d normalized = diff.normalize();
+
+        if ((normalized.y == normalized.x || normalized.y > normalized.x) && normalized.y != 0) {
+            if (diff.y > 0 ) {
+                if (this->connelly_move_up(maze))
+                    return;
+            } else {
+                if (this->connelly_move_down(maze))
+                    return;
+            }
+        }
+        if (normalized.x != 0) {
+            if (diff.x > 0){
+                if (this->connelly_move_right(maze))
+                    return;
+            }
+            else {
+                bool _ = this->connelly_move_left(maze);
+            }
+        }
+    }
+
+    char Entity::get_display_character() const {
         return this->display_character;
     }
 }
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 36a40ca..157fdcd 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -1,5 +1,4 @@
-#include "../Util/PositionVector.h"
-
+#include "../Util/Vector2d.h"
 
 #ifndef ENTITY_H
 #define ENTITY_H
@@ -7,19 +6,60 @@
 namespace game
 {
     class Maze;
+    /// Eine Entität, z.B. ein Geist
     class Entity {
         private:
-            PositionVector pos;
+            /// Die aktuelle Position des Geistes
+            Vector2d pos;
+            /// Wie der Geist dargestellt werden sollte
             char display_character;
+            /// Ist wahr, wenn der Bowie nach Links läuft, falsch, wenn er nach Rechts läuft.
             bool move_left;
 
-            void handle_bowie(Maze& maze);
-            void handle_connelly(Maze& maze, const PositionVector& player_position);
+            /// Behandle Bowie Bewegungen
+            /// @param maze Das Labyrinth
+            void handle_bowie(const Maze& maze);
+
+            /// Behandle Connelly Bewegungen
+            /// @param maze Das Labyrinth
+            /// @param player_position Die Position des Spielers
+            void handle_connelly(const Maze& maze, const Vector2d& player_position);
+
+            /// Versuche den Connelly nach oben zu bewegen
+            /// @param maze Das Labyrinth
+            /// @returns Ob die Bewegung geglückt hat
+            bool connelly_move_up(const Maze& maze);
+
+            /// Versuche den Connelly nach unten zu bewegen
+            /// @param maze Das Labyrinth
+            /// @returns Ob die Bewegung geglückt hat
+            bool connelly_move_down(const Maze& maze);
+
+            /// Versuche den Connelly nach links zu bewegen
+            /// @param maze Das Labyrinth
+            /// @returns Ob die Bewegung geglückt hat
+            bool connelly_move_left(const Maze& maze);
+
+            /// Versuche den Connelly nach Rechts zu bewegen
+            /// @param maze Das Labyrinth
+            /// @returns Ob die Bewegung geglückt hat
+            bool connelly_move_right(const Maze& maze);
         public:
-            Entity(PositionVector starting_position, char display_character);
-            void tick(Maze& maze, const PositionVector& player_position);
-            bool is_at_position(const PositionVector& position) const;
-            char get_display_character();
+            Entity(Vector2d starting_position, char display_character);
+
+            /// Halte den Entität bzw. den Geist up to date, bewege ihn
+            /// @param maze Das Labyrinth
+            /// @param player_position Die Position des Spielers
+            void tick(const Maze& maze, const Vector2d& player_position);
+
+            /// Kontrolliere, ob sich das Entity auf einer Position befindet
+            /// @param position Die Position
+            /// @returns Ob das sich das Entity auf der Position befindet
+            bool is_at_position(const Vector2d& position) const;
+
+            /// Besorge dir das Zeichen, was auf dem Labyrinth angezeigt werden soll
+            /// @returns Das Zeichen
+            char get_display_character() const;
     };
 } // game
 
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index ebec744..c03b22a 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -14,23 +14,23 @@ namespace game
     {
     }
 
-    Player::Player(const PositionVector pos) : pos(pos), keys_in_inventory(0)
+    Player::Player(const Vector2d pos) : pos(pos), keys_in_inventory(0)
     {
     }
 
-    PositionVector Player::get_pos() const
+    Vector2d Player::get_pos() const
     {
         return this->pos;
     }
 
-    void Player::update_position(const PositionVector& target)
+    void Player::update_position(const Vector2d& target)
     {
         this->pos = target;
     }
 
-    Maze Player::handle_move(Maze& maze, const PositionVector& move_vector)
+    Maze Player::handle_move(Maze& maze, const Vector2d& move_vector)
     {
-        const PositionVector target_position = PositionVector(this->get_pos().x + move_vector.x,
+        const Vector2d target_position = Vector2d(this->get_pos().x + move_vector.x,
                 this->get_pos().y + move_vector.y);
 
         if (maze.is_pos_free(target_position, this->has_key_available()))
@@ -43,21 +43,21 @@ namespace game
     }
 
     Maze Player::handle_user_input(Maze& maze, const char& input) {
-        PositionVector move_vector = {0, 0};
+        Vector2d move_vector = {0, 0};
 
         switch (input) {
             case 'w':
-                move_vector = {-1, 0};
-                break;
-            case 's':
-                move_vector = {1, 0};
-                break;
-            case 'a':
                 move_vector = {0, -1};
                 break;
-            case 'd':
+            case 's':
                 move_vector = {0, 1};
                 break;
+            case 'a':
+                move_vector = {-1, 0};
+                break;
+            case 'd':
+                move_vector = {1, 0};
+                break;
         }
 
         this->handle_move(maze, move_vector);
@@ -80,7 +80,7 @@ namespace game
         }
     }
 
-    GameState Player::handle_collisions(const Game& game, const Maze& maze) {
+    GameState Player::handle_collisions(const Game& game, const Maze& maze) const {
         char field_at_pos = maze.get_field(this->get_pos());
         // Game state sanity check
         if (game.get_state() != GameState::RUNNING)
@@ -96,9 +96,9 @@ namespace game
     }
 
 
-    void Player::tick(const Game& game, Maze& maze) {
+    GameState Player::tick(const Game& game, Maze& maze) {
         this->handle_keys(maze);
-        this->handle_collisions(game, maze);
+        return this->handle_collisions(game, maze);
     }
 
     bool Player::has_key_available() const
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 54addaa..78f1fb9 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -1,4 +1,4 @@
-#include "../Util/PositionVector.h"
+#include "../Util/Vector2d.h"
 #include "../Util/GameState.h"
 
 #ifndef PLAYER_H
@@ -17,14 +17,14 @@ namespace game
     {
         private:
             /// Die Position des Spielers
-            PositionVector pos;
+            Vector2d pos;
             int keys_in_inventory;
 
         /// Bewege den Splieler um den Bewegungsvektor, insofern die Zielposition begehbar ist
         /// @param maze Das Maze
         /// @param move_vector Die gewollte Bewegung
         /// @return Die neue Position des Spielers
-        Maze handle_move(Maze& maze, const PositionVector& move_vector);
+        Maze handle_move(Maze& maze, const Vector2d& move_vector);
 
         /// Gebe oder Nehme dem Spieler Schlüssel
         /// Updated auch das Maze (Reference!)
@@ -33,7 +33,7 @@ namespace game
 
         /// Kontrolliere, ob der Spieler gerade in einem Geist steht
         /// @param maze Das Maze
-        GameState handle_collisions(const Game& game, const Maze& maze);
+        GameState handle_collisions(const Game& game, const Maze& maze) const;
 
     public:
         /// Ein Spieler.
@@ -44,21 +44,26 @@ namespace game
 
         /// Ein Spieler
         /// @param pos Die Startposition des Spielers
-        explicit Player(PositionVector pos);
+        explicit Player(Vector2d pos);
 
         /// Kriege die Position des Spielers
         /// @return Die Position des Spielers
-        PositionVector get_pos() const;
+        Vector2d get_pos() const;
 
         /// Aktuallisiere die Position des Spielers ohne weitere Checks
         /// @param target Das ziel
-        void update_position(const PositionVector& target);
+        void update_position(const Vector2d& target);
 
-        /// 
+        /// Behandle die eingabe des Nutzers für den Spieler
+        /// @param maze Das Labyrinth
+        /// @param input Die Eingabe des Nutzers
         Maze handle_user_input(Maze& maze, const char& input);
 
-        /// 
-        void tick(const Game& game, Maze& maze);
+        /// Halte den Spieler aktuell
+        /// @param game Das Spiel
+        /// @param maze Das Labyrinth
+        /// @returns Der Status des Spiels
+        GameState tick(const Game& game, Maze& maze);
 
         /// Check, if a player has at least one key
         /// @return If the player as an available key
diff --git a/src/Environment/Game.cpp b/src/Environment/Game.cpp
index b482a7f..bb61e71 100644
--- a/src/Environment/Game.cpp
+++ b/src/Environment/Game.cpp
@@ -1,9 +1,8 @@
 #include "Game.h"
-#include "../Entities/Player.h"
 #include "Maze.h"
 #include "../Exceptions/MovementNotPossible.h"
 #include "../Exceptions/UnkownAction.h"
-#include "../Util/PositionVector.h"
+#include "../Util/Vector2d.h"
 
 using game::Player;
 using game::Maze;
@@ -12,11 +11,12 @@ using game_exceptions::MovementNotPossible;
 
 namespace game
 {
-    Game::Game(Maze& maze): maze(maze), player(0, 0), infomode_enabled(false), state(GameState::RUNNING), enemies({})
+    Game::Game(Maze& maze) : maze(maze), player(0, 0), enemies({}), state(GameState::RUNNING), infomode_enabled(false)
     {
-        PositionVector player_start_position = this->maze.get_player_start_position();
+        Vector2d player_start_position = this->maze.get_player_start_position();
 
         this->player = Player(player_start_position);
+        this->enemies = maze.get_entities();
     }
 
     GameState Game::get_state() const {
@@ -32,8 +32,12 @@ namespace game
         case 's':
         case 'd':
             break;
+        case 'i':
+            this->infomode_enabled = !this->infomode_enabled;
+            break;
         case 'q':
             this->state = GameState::QUITTING;
+            break;
         case 'h':
             cout <<
                 "Du wurdest von einem Zauberer in ein Labyrinth gesperrt, nachdem du seine Künste beleidigt hast.\n"
@@ -46,14 +50,15 @@ namespace game
         }
     }
 
-    bool Game::is_enemy_at_pos(const PositionVector& position) const{
+    bool Game::is_enemy_at_pos(const Vector2d& position) const {
         for (Entity e : this->enemies)
             if (e.is_at_position(position))
                 return true;
         return false;
     }
 
-    bool Game::should_end_game() {
+    bool Game::should_end_game() const
+    {
         return this->state != GameState::RUNNING;
     }
 
@@ -64,7 +69,7 @@ namespace game
         // Hauptschleife
         while (true)
         {
-            this->maze.render(this->player, this->enemies);
+            this->maze.render(this->player, this->enemies, this->infomode_enabled);
 
             if (this->maze.is_player_at_goal(this->player))
             {
@@ -74,6 +79,9 @@ namespace game
 
             cin >> game_input;
 
+            if (!cin)
+                this->state = GameState::QUITTING;
+
             try
             {
                 this->handle_user_input(game_input);
@@ -86,12 +94,12 @@ namespace game
                 cout << err.what() << "\n";
             }
 
-            this->player.tick(*this, this->maze);
+            this->state = this->player.tick(*this, this->maze);
 
-            for (Entity e : this->enemies)
+            for (Entity& e : this->enemies)
                 e.tick(this->maze, this->player.get_pos());
 
-            this->player.tick(*this, this->maze);
+            this->state = this->player.tick(*this, this->maze);
 
             if (this->should_end_game())
                 return;
diff --git a/src/Environment/Game.h b/src/Environment/Game.h
index 78d6c49..b4cc407 100644
--- a/src/Environment/Game.h
+++ b/src/Environment/Game.h
@@ -33,7 +33,7 @@ namespace game
         void handle_user_input(const char& input);
 
         /// Kontrolliere, ob das Spiel beendet werden sollte
-        bool should_end_game();
+        bool should_end_game() const;
 
         /// Starte das Spiel
         void run_game();
@@ -42,7 +42,10 @@ namespace game
         /// @returns Den aktuellen Status
         GameState get_state() const;
 
-        bool is_enemy_at_pos(const PositionVector& position) const ;
+        /// Krontroliere ob ein Geist sich an einer Position befindet
+        /// @param position Die Position
+        /// @returns Ob sich dort ein Geist aufhält
+        bool is_enemy_at_pos(const Vector2d& position) const ;
     };
 } // game
 
diff --git a/src/Environment/Maze.cpp b/src/Environment/Maze.cpp
index 9291c64..373bab8 100644
--- a/src/Environment/Maze.cpp
+++ b/src/Environment/Maze.cpp
@@ -2,14 +2,18 @@
 #include "../Entities/Player.h"
 #include "../Exceptions/MalformedMaze.h"
 #include "../Entities/Entity.h"
+#include "../Util/MathUtil.h"
 
 using game_exceptions::MalformedMaze;
 
 namespace game
 {
-    Maze::Maze(const vector<vector<char>> play_field, const vector<int> player_start_position, const vector<Entity> enemies):
+    class MathUtil;
+
+    Maze::Maze(const vector<vector<char>>& play_field, const vector<int>& player_start_position, const vector<Entity>& enemies):
         field(play_field),
-        player_start_position(PositionVector{player_start_position[1], player_start_position[0]})
+        player_start_position(Vector2d{player_start_position[1], player_start_position[0]}),
+        enemies(enemies)
     {
         if (!this->is_pos_free(this->player_start_position, false))
             throw MalformedMaze("Player oob");
@@ -25,7 +29,7 @@ namespace game
         return this->field[player.get_pos().y][player.get_pos().x] == 'Z';
     }
 
-    bool Maze::is_pos_free(const PositionVector& pos, const bool& player_has_key) const
+    bool Maze::is_pos_free(const Vector2d& pos, const bool& player_has_key) const
     {
         if (pos.x < 0 || pos.y < 0 || pos.y > field.size() - 1 || pos.x > field[pos.y].size() - 1)
             return false;
@@ -36,7 +40,7 @@ namespace game
         return true;
     }
 
-    void Maze::render(const Player& player, const vector<Entity> entities) const
+    void Maze::render(const Player& player, const vector<Entity> entities, const bool& infomode_enabled)
     {
         for (int y = 0; y < field.size(); ++y)
         {
@@ -56,38 +60,56 @@ namespace game
                 }
                 cout << " ";
             }
+            if (y == 0 && infomode_enabled)
+            {
+                int steps = this->calculate_steps_until_win(player.get_pos(), 5);
+                if (steps > 999)
+                    cout << steps << "Schritte bis zum Ziel";
+            }
             cout << "\n";
         }
     }
 
-    char Maze::get_field(const PositionVector& pos) const
+    char Maze::get_field(const Vector2d& pos) const
     {
         return this->field[pos.y][pos.x];
     }
 
-    void Maze::update_field(const PositionVector& pos, const char& target)
+    void Maze::update_field(const Vector2d& pos, const char& target)
     {
         this->field[pos.y][pos.x] = target;
     }
 
-    PositionVector Maze::get_player_start_position() const
+    Vector2d Maze::get_player_start_position() const
     {
         return this->player_start_position;
     }
 
-    PositionVector Maze::get_distance_pos1_pos2(const PositionVector& pos1, const PositionVector& pos2) {
+    Vector2d Maze::get_delta_vector(const Vector2d& pos1, const Vector2d& pos2) const {
         int x_diff = pos1.x - pos2.x;
         int y_diff = pos1.y - pos2.y;
+
         return {x_diff, y_diff};
     }
 
-    int Maze::calculate_steps(const PositionVector& target_position, PositionVector position, int steps) {
-        if (this->is_pos_free(position, false))
+    int Maze::calculate_steps_until_win(const Vector2d& position, const int& steps) {
+        if (!this->is_pos_free(position, false))
             return 999;
-        if (target_position.eq(position))
+        if (this->get_field(position) == 'Z')
             return 0;
         if (steps <= 0)
             return 999;
+
         vector<int> i;
+        i.push_back(this->calculate_steps_until_win(position.get_new_updated(0, -1), steps - 1));
+        i.push_back(this->calculate_steps_until_win(position.get_new_updated(0, 1), steps - 1));
+        i.push_back(this->calculate_steps_until_win(position.get_new_updated(1, 0), steps - 1));
+        i.push_back(this->calculate_steps_until_win(position.get_new_updated(-1, 0), steps - 1));
+
+        return MathUtil::get_min(i) + 1;
+    }
+
+    vector<Entity> Maze::get_entities() {
+      return this->enemies;
     }
 } // game
diff --git a/src/Environment/Maze.h b/src/Environment/Maze.h
index 24f4f3a..15373b7 100644
--- a/src/Environment/Maze.h
+++ b/src/Environment/Maze.h
@@ -1,5 +1,5 @@
 #include "../std_lib_inc.h"
-#include "../Util/PositionVector.h"
+#include "../Util/Vector2d.h"
 
 #ifndef MAZE_H
 #define MAZE_H
@@ -18,12 +18,13 @@ namespace game
     /// Das Spielfeld
     vector<vector<char>> field;
     /// Die Startposition des Spielers
-    PositionVector player_start_position;
+    Vector2d player_start_position;
+    /// Eine Liste an Gegnern
+    vector<Entity> enemies;
 
   public:
     /// Das Spielfeld
-    Maze(const vector<vector<char>> play_field, const vector<int> player_start_position, const vector<Entity> enemies);
-
+    Maze(const Vector<Vector<char>>& play_field, const Vector<int>& player_start_position, const Vector<Entity>& enemies);
     /// Kontrolliere, ob der Spieler stirbt
     /// @param player Der Spieler
     /// @return Ob der Spieler tot ist
@@ -38,31 +39,40 @@ namespace game
     /// @param pos Die Position, die überprüft werden soll
     /// @param player_has_key If the player has at least one key
     /// @return Ob die Position begehbar ist
-    bool is_pos_free(const PositionVector& pos, const bool& player_has_key) const;
+    bool is_pos_free(const Vector2d& pos, const bool& player_has_key) const;
 
     /// Zeige das Spielfeld in der Konsole an
     /// @param player Der Spieler
-    void render(const Player& player, const vector<Entity> entities) const;
+    /// @param infomode_enabled Ob der Infomode aktiv ist
+    void render(const Player& player, vector<Entity> entities, const bool& infomode_enabled);
 
     /// Kriege den Wert einer Position
     /// @param pos Die gewollte Position
     /// @return Der Wert der Position
-    char get_field(const PositionVector& pos) const;
+    char get_field(const Vector2d& pos) const;
 
     /// Ersetze den Wert von einer Position
     /// @param pos Die Position die ersetzt werden soll
     /// @param target Der Wert, auf den die Position gesetzt werden soll
-    void update_field(const PositionVector& pos, const char& target);
+    void update_field(const Vector2d& pos, const char& target);
 
     /// Kriege die Startposition des Spielers
     /// @return Die Startposition des Spielers
-    PositionVector get_player_start_position() const;
+    Vector2d get_player_start_position() const;
 
     /// Berrechne den Abstand zwischen zwei Vektoren
     /// @return Der Abstand als Differenzvektor
-    PositionVector get_distance_pos1_pos2(const PositionVector& pos1, const PositionVector& pos2);
+    Vector2d get_delta_vector(const Vector2d& pos1, const Vector2d& pos2) const;
 
-    int calculate_steps(const PositionVector& target_position, PositionVector position, int steps);
+    /// Berechne wie viele Schritte benötigt werden, um das Labyrinth zu schaffen
+    /// @warning Steps nicht zu groß setzen! Diese Funktion ist 4-fach rekursiv!
+    /// @param position Die Startposition
+    /// @param steps Wie viele Schritte maximal gegangen werden sollten
+    /// @returns Wie viele Schritte benötigt werden
+    int calculate_steps_until_win(const Vector2d& position, const int& steps);
+
+    /// Kriege alle eingelesenen Entities
+    vector<Entity> get_entities();
   };
 } // game
 
diff --git a/src/Util/MathUtil.cpp b/src/Util/MathUtil.cpp
new file mode 100644
index 0000000..b9c6241
--- /dev/null
+++ b/src/Util/MathUtil.cpp
@@ -0,0 +1,11 @@
+#include "MathUtil.h"
+
+namespace game {
+    int MathUtil::get_min(const vector<int>& numbers) {
+        int i = numbers[0];
+        for (const int j : numbers)
+            if (j < i)
+                i = j;
+        return i;
+    }
+} // game
diff --git a/src/Util/MathUtil.h b/src/Util/MathUtil.h
new file mode 100644
index 0000000..340a660
--- /dev/null
+++ b/src/Util/MathUtil.h
@@ -0,0 +1,16 @@
+#include "../std_lib_inc.h"
+#ifndef UTIL_H
+#define UTIL_H
+
+namespace game
+{
+    class MathUtil{
+        public:
+            /// Gebe die minimale Nummer aus einer Liste zurück
+            /// @param numbers Eine liste an nummern
+            /// @returns Die kleinste Nummer
+            static int get_min(const vector<int>& numbers);
+    };
+} // game
+
+#endif //UTIL_H
diff --git a/src/Util/MazeParser.cpp b/src/Util/MazeParser.cpp
index 461d649..9fb1876 100644
--- a/src/Util/MazeParser.cpp
+++ b/src/Util/MazeParser.cpp
@@ -65,12 +65,14 @@ namespace game
 
                 if (!validate_maze_element(input))
                     throw MalformedMaze("The given input is not a valid element of a maze!");
-                if (!is_valid_enemy(input))
-                    row.push_back(input);
-                else {
+                if (is_valid_enemy(input))
+                {
                     enemies.push_back(Entity({x, y}, input));
                     row.push_back('.');
                 }
+                else {
+                    row.push_back(input);
+                }
             }
 
             field.push_back(row);
@@ -78,6 +80,6 @@ namespace game
 
         vector<int> player_start_pos = request_numbers_from_user(2);
 
-        return Maze(field, player_start_pos, enemies);
+        return {field, player_start_pos, enemies};
     } // Beispieleingabe: `4 3 #.# #.K #T# #Z# 0 1`
 } // game
diff --git a/src/Util/MazeParser.h b/src/Util/MazeParser.h
index 29c60a0..3de7fe0 100644
--- a/src/Util/MazeParser.h
+++ b/src/Util/MazeParser.h
@@ -19,7 +19,9 @@ namespace game
     /// Erlaubte Zeichen in einem Labyrinth
     /// Ist eine Konstante, darf also in global scope
     static const vector<char> valid_maze_elements = {'Z', '.', '#', 'A', 'K', 'T', 'B', 'C'};
+    /// Welche Geistertypen es gibt
     static const vector<char> valid_enemies = {'A', 'B', 'C'};
+    /// Die Maximale Labyrinthgröße
     static constexpr int MAX_MAZE_SIZE = 20;
 
     class Maze;
@@ -36,6 +38,9 @@ namespace game
         /// @return Ob das gegebene Zeichen in einem Labyrinth vorkommen darf
         static bool validate_maze_element(const char& target);
 
+        /// Ob der angegebene char in valider Geist ist
+        /// @param target Der zu kontrollierende Wert
+        /// @returns Ob der Wert ein Valider Geist ist
         static bool is_valid_enemy(const char& target);
 
     public:
diff --git a/src/Util/PositionVector.cpp b/src/Util/PositionVector.cpp
deleted file mode 100644
index 9c88d5d..0000000
--- a/src/Util/PositionVector.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "PositionVector.h"
-
-namespace game
-{
-  PositionVector::PositionVector(const int x, const int y)
-  {
-    this->x = x;
-    this->y = y;
-  }
-
-  void PositionVector::update(const int& x, const int& y)
-  {
-    this->x = x;
-    this->y = y;
-  }
-
-  void PositionVector::change_x(const int& amount) {
-      this->x += amount;
-  }
-
-  void PositionVector::change_y(const int& amount) {
-      this->y += amount;
-  }
-
-  void PositionVector::normalize() {
-      if (this->x < 0)
-          this->x *= -1;
-      if (this->y < 0)
-          this->y *= -1;
-  }
-
-  bool PositionVector::eq(const PositionVector& position) const {
-      return this->x == position.x && this->y == position.y;
-  }
-} // game
diff --git a/src/Util/PositionVector.h b/src/Util/PositionVector.h
deleted file mode 100644
index 0fc0bc6..0000000
--- a/src/Util/PositionVector.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef POSITION_H
-#define POSITION_H
-
-namespace game
-{
-    /// Ein Vector aus zwei zahlen.
-    /// Kann eine Position oder eine Differenz zwischen zwei Positionen darstellen.
-    struct PositionVector
-    {
-        // struct -> members public by default
-        // Die beiden Variablen des Vectors
-        int x;
-        int y;
-
-        /// Ein Vector aus zwei zahlen.
-        /// Kann eine Position oder eine Differenz zwischen zwei Positionen darstellen.
-        /// @param x Die 'X'-Koordinate
-        /// @param y Die 'Y'-Koordinate
-        PositionVector(int x, int y);
-
-        /// Aktualisiere die Werte des Vectors
-        /// @param x Die neue 'X'-Koordinate
-        /// @param y Die neue 'Y'-Koordinate
-        void update(const int& x, const int& y);
-
-        void change_x(const int& amount);
-        void change_y(const int& amount);
-
-        void normalize();
-
-        bool eq(const PositionVector& position)const ;
-    };
-} // game
-
-#endif //POSITION_H
diff --git a/src/Util/Vector2d.cpp b/src/Util/Vector2d.cpp
new file mode 100644
index 0000000..51db2d9
--- /dev/null
+++ b/src/Util/Vector2d.cpp
@@ -0,0 +1,47 @@
+#include "Vector2d.h"
+
+namespace game
+{
+  Vector2d::Vector2d(const int x, const int y)
+  {
+    this->x = x;
+    this->y = y;
+  }
+
+  void Vector2d::update(const int& x, const int& y)
+  {
+    this->x = x;
+    this->y = y;
+  }
+
+  void Vector2d::change_x(const int& amount) {
+      this->x += amount;
+  }
+
+  void Vector2d::change_y(const int& amount) {
+      this->y += amount;
+  }
+
+  Vector2d Vector2d::normalize() {
+      Vector2d v = *this;
+      if (v.x < 0)
+          v.x *= -1;
+      if (v.y < 0)
+          v.y *= -1;
+      return v;
+  }
+
+  bool Vector2d::eq(const Vector2d& position) const {
+      return this->x == position.x && this->y == position.y;
+  }
+
+
+  Vector2d Vector2d::get_new_updated(const int& diff_x, const int& diff_y) const {
+      Vector2d new_position = *this;
+      new_position.change_x(diff_x);
+      new_position.change_y(diff_y);
+
+      return new_position;
+  }
+
+} // game
diff --git a/src/Util/Vector2d.h b/src/Util/Vector2d.h
new file mode 100644
index 0000000..b506f4e
--- /dev/null
+++ b/src/Util/Vector2d.h
@@ -0,0 +1,51 @@
+#ifndef POSITION_H
+#define POSITION_H
+
+namespace game
+{
+    /// Ein Vector aus zwei zahlen.
+    /// Kann eine Position oder eine Differenz zwischen zwei Positionen darstellen.
+    struct Vector2d
+    {
+        // struct -> members public by default
+        // Die beiden Variablen des Vectors
+        int x;
+        int y;
+
+        /// Ein Vector aus zwei zahlen.
+        /// Kann eine Position oder eine Differenz zwischen zwei Positionen darstellen.
+        /// @param x Die 'X'-Koordinate
+        /// @param y Die 'Y'-Koordinate
+        Vector2d(int x, int y);
+
+        /// Aktualisiere die Werte des Vectors
+        /// @param x Die neue 'X'-Koordinate
+        /// @param y Die neue 'Y'-Koordinate
+        void update(const int& x, const int& y);
+
+        /// Verschiebe den X Wert des Vektors um eine Anzahl
+        /// @param amount Die zu verschiebene Anzahl
+        void change_x(const int& amount);
+
+        /// Verschiebe den Y Wert des Vektors um eine Anzhal
+        /// @param amount Die zu verschiebene Anzahl
+        void change_y(const int& amount);
+
+        /// Kriege einen normalisierten Vektor zurück
+        /// @returns Den aktuellen Vektor als normalisierter Vektor
+        Vector2d normalize();
+
+        /// Kontrolliere, ob ein Vektor einem anderen Enspricht
+        /// @param position Die Position mit der verglichen werden soll
+        /// @returns Ob die Position die gleiche ist
+        bool eq(const Vector2d& position) const;
+
+        /// Kriege einen Vektor, der mit den gegebenen Werten verschoben worden ist
+        /// @param diff_x Die Verschiebung auf der X-Achse
+        /// @param diff_y Die Verschiebung auf der Y-Achse
+        /// @returns Den berrechneten Vektor
+        Vector2d get_new_updated(const int& diff_x, const int& diff_y) const;
+    };
+} // game
+
+#endif //POSITION_H
diff --git a/src/main.cpp b/src/main.cpp
index fb584fc..aa72ad9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,8 +2,6 @@
 #include "Util/MazeParser.h"
 #include "Environment/Game.h"
 #include "Exceptions/MalformedMaze.h"
-#include "Exceptions/MovementNotPossible.h"
-#include "Exceptions/UnkownAction.h"
 #include "Util/GameState.h"
 
 using game::Maze;
@@ -42,6 +40,8 @@ int main()
 }
 
 
+/// Schriebe eine Nachricht in die Konsole wenn das Programm beendet wird
+/// @param state Der Spielzustand als das Programm beendet wurde
 void print_exit_message_based_on_state(const GameState& state) {
     switch (state){
         case GameState::QUITTING: