diff --git a/.idea/editor.xml b/.idea/editor.xml
index 451df98..5484bef 100644
--- a/.idea/editor.xml
+++ b/.idea/editor.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="BackendCodeEditorSettings">
+    <option name="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=BDF50448_002D2D09_002D587C_002DB381_002D254F4D0C7518_002Fd_003AEngine_002Fd_003Asrc_002Ff_003Aworld_002Ecpp/@EntryIndexedValue" value="ForceIncluded" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CDeclarationWithImplicitIntType/@EntryIndexedValue" value="WARNING" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CommentTypo/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConstevalIfIsAlwaysConstant/@EntryIndexedValue" value="WARNING" type="string" />
diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt
index ac8a4ab..0310a87 100644
--- a/Engine/CMakeLists.txt
+++ b/Engine/CMakeLists.txt
@@ -6,7 +6,8 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/room.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/game.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/player.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/scenery.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/CommandParser.cpp)
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/CommandParser.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/world.cpp)
 
 
 add_library(Engine SHARED ${SOURCES})
diff --git a/Engine/headers/CommandParser.h b/Engine/headers/CommandParser.h
index 01de049..45c42f0 100644
--- a/Engine/headers/CommandParser.h
+++ b/Engine/headers/CommandParser.h
@@ -6,8 +6,8 @@
 typedef int (*FUNCTION)(const std::string &s);
 
 static std::vector<std::string> Verbs{"Quit", "Exit", "Go", "Move", "Look"};
-static std::vector<std::string> Nouns{"Object", "Door", "North", "South", "East",
-                                      "West",   "Up",   "Down",  "Left",  "right"};
+static std::vector<std::string> Nouns{"Object", "Door", "North", "South", "East", "West",
+                                      "Up",     "Down", "Left",  "Right", "To",   "At"};
 
 class CommandParser {
 private:
diff --git a/Engine/headers/game.h b/Engine/headers/game.h
index 36dc1ee..97b6dab 100644
--- a/Engine/headers/game.h
+++ b/Engine/headers/game.h
@@ -28,10 +28,8 @@ private:
     std::ifstream stream;
     bool isActive;
 
-
     inline static Game *game_;
 
-
     // Likely need to make sure Player is ADDED to room
     // We want player and objects to exist IN room
     Room currentRoom;
@@ -44,7 +42,7 @@ public:
     void Run();
     bool Save();
 
-    void ChangeRoom(Room r);
+    void ChangeRoom(const Room &r);
     Room GetCurrentRoom() { return currentRoom; }
 
     inline bool operator!() const {
@@ -64,9 +62,7 @@ public:
         return *game_;
     }
 
-    static void SetGameInstance(Game * g) {
-        game_ = g;
-    }
+    static void SetGameInstance(Game *g) { game_ = g; }
 
     ~Game();
 };
diff --git a/Engine/headers/player.h b/Engine/headers/player.h
index a2ea04b..e79ad7c 100644
--- a/Engine/headers/player.h
+++ b/Engine/headers/player.h
@@ -7,36 +7,27 @@
 
 class Player : Creature {
 
-    private:
+private:
     // Inventory inventory;
 
-    // Lets keep the room a loose reference to avoid to many hardcoded details and other info
-    int curRoomID = -1;
-    int prevRoomID = -1;
-
 public:
-
     Player();
     Player(Player &rhs);
-    Player& operator=(Player& rhs);
+    Player &operator=(Player &rhs);
 
     void Init() override;
     void LevelUp() override;
     void Die() override;
     void TakeDamage(int damageType, float damage) override;
     float GetHealth() override;
-    void ChangeRoom(int roomID);
 
-    inline friend void swap(Player& lhs,  Player &rhs) noexcept
-    {    
+    inline friend void swap(Player &lhs, Player &rhs) noexcept {
         using std::swap;
         swap(lhs.id, rhs.id);
         swap(lhs.name, rhs.name);
         swap(lhs.description, rhs.description);
         swap(lhs.stats, rhs.stats);
         swap(lhs.level, rhs.level);
-        swap(lhs.prevRoomID, rhs.prevRoomID);
-        swap(lhs.curRoomID, rhs.curRoomID);
     }
 
     ~Player();
diff --git a/Engine/headers/room.h b/Engine/headers/room.h
index 7ae7918..763ba1e 100644
--- a/Engine/headers/room.h
+++ b/Engine/headers/room.h
@@ -4,6 +4,7 @@
 #include <string>
 #include <vector>
 #include "json.hpp"
+#include "player.h"
 #include "scenery.h"
 
 using json = nlohmann::json;
@@ -26,14 +27,17 @@ private:
     int id;
     std::string name;
     std::string description;
+    Player player;
     std::vector<Exit> exits;
-    std::vector<Scenery> scenery;
+    std::vector<Scenery> scenery; /// ToDo: Replace with entity component system
 
 public:
     Room();
     Room(int i, std::string n, std::string desc, std::vector<Exit> e, std::vector<Scenery> s);
     Room(const Room &r);
 
+    void Enter(Player &p);
+
     void PrintAvalibleExits();
     void Print() const;
     int GetID() const { return id; }
@@ -53,8 +57,20 @@ public:
         return false;
     }
 
+    Room &operator=(Room rhs);
+
     ~Room();
 
     friend void to_json(nlohmann::json &j, const Room &r);
     friend void from_json(const nlohmann::json &j, Room &r);
+
+    inline friend void swap(Room &lhs, Room &rhs) noexcept {
+        using std::swap;
+        swap(lhs.id, rhs.id);
+        swap(lhs.name, rhs.name);
+        swap(lhs.description, rhs.description);
+        swap(lhs.player, rhs.player);
+        swap(lhs.exits, rhs.exits);
+        swap(lhs.scenery, rhs.scenery);
+    }
 };
diff --git a/Engine/headers/world.h b/Engine/headers/world.h
new file mode 100644
index 0000000..7b37300
--- /dev/null
+++ b/Engine/headers/world.h
@@ -0,0 +1,10 @@
+#pragma once
+#include "room.h"
+
+class World {
+private:
+    std::vector<std::vector<Room>> rooms;
+
+public:
+    void Init();
+};
diff --git a/Engine/src/CommandParser.cpp b/Engine/src/CommandParser.cpp
index 16a6aba..7865c47 100644
--- a/Engine/src/CommandParser.cpp
+++ b/Engine/src/CommandParser.cpp
@@ -61,11 +61,15 @@ int CommandParser::Parse() {
     nouns = Noun(c);
 
     for (const auto &verb: verbs) {
-
         if (!commands[verb]) {
             CommandUnrecognized();
             break;
         }
+
+        for (const auto &n: nouns) {
+            noun = n;
+        }
+        
         toRun = commands[verb];
     }
 
diff --git a/Engine/src/game.cpp b/Engine/src/game.cpp
index 0656966..e33de3b 100644
--- a/Engine/src/game.cpp
+++ b/Engine/src/game.cpp
@@ -59,15 +59,11 @@ void Game::Run() {
 
 bool Game::Save() { return false; }
 
-void Game::ChangeRoom(Room r) {
+void Game::ChangeRoom(const Room &r) {
     if (currentRoom != r) {
         currentRoom = r;
 
-        player.ChangeRoom(currentRoom.GetID());
-
-        currentRoom.Print();
-        printf("\n");
-        currentRoom.PrintAvalibleExits();
+        currentRoom.Enter(player);
     }
 }
 
@@ -141,7 +137,15 @@ int Move(const std::string &c) {
             break;
     };
 
-    Game::Instance().ChangeRoom(rooms[curY][curX]);
+    Room temp;
+    try {
+        temp = rooms.at(curY).at(curX);
+    } catch (std::out_of_range) {
+        printf("Error, Room Data non existent \n");
+        return -1;
+    }
+
+    Game::Instance().ChangeRoom(temp);
     return 0;
 }
 
@@ -153,8 +157,7 @@ int Look(const std::string &c) {
     return 0;
 }
 
-Game::~Game()
-{
+Game::~Game() {
     isActive = false;
     progress = 0;
-}
\ No newline at end of file
+}
diff --git a/Engine/src/player.cpp b/Engine/src/player.cpp
index 78550c1..2390d96 100644
--- a/Engine/src/player.cpp
+++ b/Engine/src/player.cpp
@@ -2,24 +2,17 @@
 #include <algorithm>
 #include <string>
 
-Player::Player()
-{
-    Init();
-}
+Player::Player() { Init(); }
 
-Player::Player(Player &rhs)
-{
+Player::Player(Player &rhs) {
     id = rhs.id;
     level = rhs.level;
     stats = rhs.stats;
     name = rhs.name;
     description = rhs.description;
-    curRoomID = rhs.curRoomID;
-    prevRoomID = rhs.prevRoomID;
 }
 
-Player& Player::operator=(Player& rhs)
-{
+Player &Player::operator=(Player &rhs) {
     swap(*this, rhs);
     return *this;
 }
@@ -42,24 +35,10 @@ void Player::TakeDamage(int damageType, float damage) {
 
 float Player::GetHealth() { return 0.0f; }
 
-void Player::ChangeRoom(int roomID) {
-    if (prevRoomID == roomID) {
-        curRoomID = prevRoomID;
-    }
-
-    else if (curRoomID != roomID) {
-        prevRoomID = curRoomID;
-        curRoomID = roomID;
-    }
-}
-
-Player::~Player()
-{    
+Player::~Player() {
     id = -1;
     level = -1;
     stats = {};
     name.erase();
     description.erase();
-    curRoomID = -1;
-    prevRoomID = -1;
 }
diff --git a/Engine/src/room.cpp b/Engine/src/room.cpp
index 58e0bc8..54b5a8b 100644
--- a/Engine/src/room.cpp
+++ b/Engine/src/room.cpp
@@ -33,6 +33,16 @@ Room::~Room() {
     exits.clear();
 }
 
+void Room::Enter(Player &p) {
+    player = p;
+    Print();
+}
+
+Room &Room::operator=(Room rhs) {
+    swap(*this, rhs);
+    return *this;
+}
+
 void Room::Print() const {
     printf("%s\n", name.c_str());
     printf("%s\n", description.c_str());
diff --git a/Engine/src/world.cpp b/Engine/src/world.cpp
new file mode 100644
index 0000000..ab405bb
--- /dev/null
+++ b/Engine/src/world.cpp
@@ -0,0 +1,3 @@
+#include "world.h"
+
+void World::Init() { return; }
diff --git a/main.cpp b/main.cpp
index 7296698..5321cbf 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,8 +1,8 @@
+#include <chrono>
 #include "game.h"
 
 void EditRooms() {
 
-
     fs::path path("Resources/rooms.json");
 
     std::vector<std::vector<Room>> roomDat = {
@@ -43,10 +43,13 @@ void EditRooms() {
     outFile.close();
 }
 
-
 int main(int argc, char *argv[]) {
-    Game game; // Calls default constructor which Initializes GAME
-    
+    Game game;
+    double delta;
+    double t;
+
+    // double current_time =
+
     if (!game) {
         game.Init();
         Game::SetGameInstance(&game);