diff --git a/assets/walls/portal1.png b/assets/walls/portal1.png
new file mode 100644
index 00000000..d7d1f637
Binary files /dev/null and b/assets/walls/portal1.png differ
diff --git a/assets/walls/portal2.png b/assets/walls/portal2.png
new file mode 100644
index 00000000..9bec4929
Binary files /dev/null and b/assets/walls/portal2.png differ
diff --git a/assets/walls/portal3,png.png b/assets/walls/portal3,png.png
new file mode 100644
index 00000000..13f64363
Binary files /dev/null and b/assets/walls/portal3,png.png differ
diff --git a/assets/walls/portal4.png b/assets/walls/portal4.png
new file mode 100644
index 00000000..63920943
Binary files /dev/null and b/assets/walls/portal4.png differ
diff --git a/assets/walls/teleport.png b/assets/walls/teleport.png
new file mode 100644
index 00000000..28292024
Binary files /dev/null and b/assets/walls/teleport.png differ
diff --git a/assets/weapons/10.png b/assets/weapons/10.png
new file mode 100644
index 00000000..ee30a145
Binary files /dev/null and b/assets/weapons/10.png differ
diff --git a/assets/weapons/15.png b/assets/weapons/15.png
new file mode 100644
index 00000000..5ef81bde
Binary files /dev/null and b/assets/weapons/15.png differ
diff --git a/assets/weapons/2.png b/assets/weapons/2.png
new file mode 100644
index 00000000..d764f765
Binary files /dev/null and b/assets/weapons/2.png differ
diff --git a/assets/weapons/6.png b/assets/weapons/6.png
new file mode 100644
index 00000000..4c6e464d
Binary files /dev/null and b/assets/weapons/6.png differ
diff --git a/assets/weapons/8.png b/assets/weapons/8.png
new file mode 100644
index 00000000..c5f0c5aa
Binary files /dev/null and b/assets/weapons/8.png differ
diff --git a/source/Interfaces/Button.cpp b/source/Interfaces/Button.cpp
index e50593c9..e1c480bf 100644
--- a/source/Interfaces/Button.cpp
+++ b/source/Interfaces/Button.cpp
@@ -31,7 +31,6 @@ void i_2D::Button::setMFont(const sf::Font &font) {
  */
 void i_2D::Button::setPosition(sf::Vector2f pos) {
     button.setPosition(pos);
-
     float xPos = (pos.x + button.getGlobalBounds().width / 2) - (text->getLocalBounds().width/2);
     float yPos = (pos.y + button.getGlobalBounds().height / 2) - (text->getLocalBounds().height/2);
     text->setPosition({xPos, yPos});
@@ -51,10 +50,10 @@ bool i_2D::Button::isMouseOver(sf::RenderWindow &window) {
     float btnPosX = button.getPosition().x;
     float btnPosY = button.getPosition().y;
 
-    float btnxPosWidth = button.getPosition().x + button.getLocalBounds().width;
-    float btnyPosHeight = button.getPosition().y + button.getLocalBounds().height;
+    float btnXPosWidth = button.getPosition().x + button.getLocalBounds().width;
+    float btnYPosHeight = button.getPosition().y + button.getLocalBounds().height;
 
-    if(mouseX < btnxPosWidth && mouseX > btnPosX && mouseY < btnyPosHeight && mouseY > btnPosY){
+    if(mouseX < btnXPosWidth && mouseX > btnPosX && mouseY < btnYPosHeight && mouseY > btnPosY){
         return true;
     }
     return false;
diff --git a/source/Interfaces/Component.hpp b/source/Interfaces/Component.hpp
index b16c534b..670ee641 100644
--- a/source/Interfaces/Component.hpp
+++ b/source/Interfaces/Component.hpp
@@ -13,8 +13,7 @@
 
 namespace i_2D
 {
-    class Component : public sf::Drawable
-            , public sf::Transformable
+    class Component : public sf::Drawable, public sf::Transformable
     {
     public:
         typedef std::shared_ptr<Component> Ptr;
diff --git a/source/Interfaces/Group3_README.md b/source/Interfaces/Group3_README.md
index 92207be1..8f1533ae 100644
--- a/source/Interfaces/Group3_README.md
+++ b/source/Interfaces/Group3_README.md
@@ -54,4 +54,44 @@ The function ensures that the user's interactions with the maze application are
 <details> <summary>Functionalities:</summary>
 
 ### <span style="color: orange;"> Button Constructor
+</details>
+
+
+
+
+
+
+
+
+
+
+# <span style="color: green;">TextureHolder Class</span>
+
+
+## <span style="color: aqua;">Description
+
+The `TextureHolder` class is responsible for creating and storing references to sf::Texture objects. It is given a file, generates an sf::Texture, and readily gives a reference to the generated texture when asked.
+<details> <summary> Functionalities </summary>
+
+###  <span style="color: orange;">LoadTexture Function
+
+The `LoadTexture` function is a part of the `TextureHolder` class and is responsible for generating sf::Textures from a given file path. 
+
+The `LoadTexture` function consists of the following main functionalities:
+- Attempt to generate sf::Texture using given file path
+- Store the generated sf::Texture in a map using the id as a key
+
+The function allows new sf::Textures to be instantiated and stored to the class for future reference calling by id.
+
+
+###  <span style="color: orange;">GetTexture Function
+
+The `GetTexture` function is a part of the `TextureHolder` class and is responsible for getting a reference to the initialized sf::Texture with the matching id. 
+
+The `GetTexture` function performs the following key tasks:
+- Determine if there is a loaded texture with the given id
+- Return the dereferenced sf::Texture that matches the id
+
+The function allows for easy reference to any of the loaded sf::Textures without having to instantiate new ones for each use. 
+
 </details>
\ No newline at end of file
diff --git a/source/Interfaces/Inventory.cpp b/source/Interfaces/Inventory.cpp
index 134a992d..d67f4180 100644
--- a/source/Interfaces/Inventory.cpp
+++ b/source/Interfaces/Inventory.cpp
@@ -16,12 +16,16 @@ void i_2D::Inventory::ConstructInventory(sf::Font &font) {
     mInventoryWindow->setSize({mWorldSize.x,mWorldSize.y/2});
     mInventoryWindow->setFillColor(sf::Color::Black);
     mInventoryWindow->setPosition(sf::Vector2f{0.f,50.f});
+
+    // Set row & col sizes
     if(mWorldSize.x > 1800){
         mCol = 5;
     }else mCol = 3;
     if(mWorldSize.y > 900){
         mRow = 4;
     }else mRow = 3;
+
+    // Create 2d vector of buttons
     for(int i = 0; i < mRow; i++) {
         std::vector<std::unique_ptr<Button>> v1;
         for (int j = 0; j < mCol; j++) {
diff --git a/source/Interfaces/MainInterface.cpp b/source/Interfaces/MainInterface.cpp
index a54c0338..ef15b8a5 100644
--- a/source/Interfaces/MainInterface.cpp
+++ b/source/Interfaces/MainInterface.cpp
@@ -8,6 +8,9 @@
 
 namespace i_2D {
 
+    sf::Clock timer;
+    float elapsedTime = 0.0f;
+
     /**
      * @brief Constructs a `MainInterface` object.
      *
@@ -25,12 +28,7 @@ namespace i_2D {
         mTextBox = std::make_unique<TextBox>(mFont);
         auto a = mWindow.getSize().x;
         auto b = mWindow.getSize().y;
-        mMenu.initialize(mFont,sf::Vector2f {static_cast<float>(a),static_cast<float>(b)});
-//        mTestButton = std::make_unique<Button>("test",
-//                                               sf::Vector2f (200,50),sf::Color::Black,
-//                                               sf::Color::White,mFont);
-//        mTestButton->setPosition(sf::Vector2f (200,50));
-
+        mMenu.initialize(mFont, sf::Vector2f{static_cast<float>(a), static_cast<float>(b)});
         ChooseTexture();
     }
 
@@ -49,7 +47,8 @@ namespace i_2D {
             const WorldGrid &grid, const type_options_t &type_options,
             const item_map_t &item_map, const agent_map_t &agent_map) {
         std::vector<std::string> symbol_grid(grid.GetHeight());
-
+        mGridHeight = grid.GetHeight();
+        mGridWidth = grid.GetWidth();
         // Load the world into the symbol_grid;
         for (size_t y = 0; y < grid.GetHeight(); ++y) {
             symbol_grid[y].resize(grid.GetWidth());
@@ -58,7 +57,7 @@ namespace i_2D {
             }
         }
 
-        // Add in the agents / entities
+        // Add in the entities
         for (const auto &[id, item_ptr]: item_map) {
             GridPosition pos = item_ptr->GetPosition();
             char c = '+';
@@ -68,6 +67,7 @@ namespace i_2D {
             symbol_grid[pos.CellY()][pos.CellX()] = c;
         }
 
+        // Add in the agents
         for (const auto &[id, agent_ptr]: agent_map) {
             GridPosition pos = agent_ptr->GetPosition();
             char c = '*';
@@ -109,17 +109,21 @@ namespace i_2D {
     */
     void MainInterface::DrawGrid(const WorldGrid &grid, const type_options_t &type_options, const item_map_t &item_map,
                                  const agent_map_t &agent_map) {
+        // Clear old drawing
+        mWindow.clear(sf::Color::White);
+
         // Check player's position
         mPlayerPosition = sf::Vector2i(this->position.GetX(), this->position.GetY());
 
-        mWindow.clear(sf::Color::White);
-
+        // Create grid of symbols representing the world
         std::vector<std::string> symbol_grid;
         std::vector<std::string> default_grid = CreateVectorMaze(grid, type_options, item_map, agent_map);
 
+        // Determine cell size
         sf::Vector2f cellSize = CalculateCellSize(grid);
         float drawSpaceWidth, drawSpaceHeight, drawCenterX, drawCenterY;
-        CalculateDrawSpace(grid, cellSize.x, drawSpaceWidth, drawSpaceHeight, drawCenterX, drawCenterY);
+        CalculateDrawSpace(grid, cellSize.x, drawSpaceWidth,
+                           drawSpaceHeight, drawCenterX, drawCenterY);
 
         if (mGridSizeLarge) {
             symbol_grid = LargeDisplayGrid(default_grid);
@@ -127,36 +131,80 @@ namespace i_2D {
             symbol_grid = default_grid;
         }
 
+        // Create a render texture to draw the grid
+        sf::RenderTexture renderTexture;
+        renderTexture.create({static_cast<unsigned int>(drawSpaceWidth), static_cast<unsigned int>(drawSpaceHeight)});
+        renderTexture.clear(sf::Color::White);
+
         for (size_t iterY = 0; iterY < symbol_grid.size(); ++iterY) {
             for (size_t iterX = 0; iterX < symbol_grid[0].size(); ++iterX) {
-
-                float cellPosX = drawCenterX + static_cast<float>(iterX) * cellSize.x;
-                float cellPosY = drawCenterY + static_cast<float>(iterY) * cellSize.y;
+                float cellPosX = static_cast<float>(iterX) * cellSize.x;
+                float cellPosY = static_cast<float>(iterY) * cellSize.y;
                 char symbol = symbol_grid[iterY][iterX];
 
-
                 sf::RectangleShape cellRect(sf::Vector2f(cellSize.x, cellSize.y));
-                sf::RectangleShape cell(sf::Vector2f(cellSize.x, cellSize.y));
                 cellRect.setPosition(sf::Vector2f(cellPosX, cellPosY));
 
-                cellRect.setPosition(sf::Vector2f(cellPosX, cellPosY));
+                sf::RectangleShape cell(sf::Vector2f(cellSize.x, cellSize.y));
                 cell.setPosition(sf::Vector2f(cellPosX, cellPosY));
 
-
-                SwitchCellSelect(cellRect, cell, symbol);
-
-
+                SwitchCellSelect(renderTexture, cellRect, cell, symbol);
             }
-
         }
+        renderTexture.display();
+        DrawTimer();
+        DrawHealthInfo();
+        // Draw the texture to the window
+        sf::Sprite sprite(renderTexture.getTexture());
+        sprite.setPosition({drawCenterX, drawCenterY});
+        mWindow.draw(sprite);
 
         // Display everything
-        mMenu.drawto(mWindow);
         mTextBox->DrawTo(mWindow);
         mMessageBoard->DrawTo(mWindow);
+        mMenu.drawto(mWindow);
         mWindow.display();
     }
 
+    /**
+     * @brief this function draws timer and checks the elapsed time and
+     * shows remainder if the timer exceed above 5 seconds. and sestart the timer every move
+     * the player makes.
+     */
+    void MainInterface::DrawTimer() {
+        // Get elapsed time in seconds
+        elapsedTime = timer.getElapsedTime().asSeconds();
+
+        float testNum = 0.12345;
+        std::string testStr = std::to_string(testNum);
+
+
+        // Set up font and location
+        sf::Text timerText(mFont);
+        timerText.setCharacterSize(24);
+        timerText.setPosition({750.0f, 75.0f}); // Adjust position as needed
+
+        // Create text for current value
+        timerText.setString("Time: " + std::to_string(elapsedTime) + " S");
+        timerText.setFillColor(sf::Color::Blue);
+        mWindow.draw(timerText);
+    }
+
+    void MainInterface::DrawHealthInfo()
+    {
+        //TODO fix this
+//        // Reference health property
+//        int health = GetProperty<int>("Health");
+//
+//        // Set text properties and draw
+//        sf::Text healthText(mFont);
+//        healthText.setCharacterSize(24);
+//        healthText.setPosition({20.0f, 75.0f});
+//        healthText.setFillColor(sf::Color::Green);
+//        healthText.setString("Hp: " + std::to_string(health));
+//        mWindow.draw(healthText);
+    }
+
     /**
      * @brief Creates a 9x23 window of the symbol grid centered around the player's position.
      *
@@ -223,23 +271,15 @@ namespace i_2D {
                                        const type_options_t &type_options,
                                        const item_map_t &item_map,
                                        const agent_map_t &agent_map) {
-//        if(grid.GetWidth() > COL or grid.GetHeight() > ROW){
-//            mGridSizeLarge = true;
-//        }
-        while (mWindow.isOpen()) {
+        // Initialize action_id and timer
+        size_t action_id = 0;
+        timer.restart();
+
+        // While the timer is going
+        while (mWindow.isOpen() && timer.getElapsedTime().asSeconds() < mInputWaitTime) {
             sf::Event event;
 
-//            if(sf::Keyboard::isKeyPressed(sf::Keyboard::Enter)){
-//                if(!mTextBox->IsSelected()) {
-//                    mTextBox->SetSelected(true);
-//                }else{
-//                    mMessageBoard->Send(mTextBox->GetText());
-//                    mTextBox->SetString("");
-//                    mTextBox->SetSelected(false);
-//                }
-//            }else if(sf::Keyboard::isKeyPressed(sf::Keyboard::Escape)){
-//                mTextBox->SetSelected(false);
-//            }
+            // Check through all events generated in this frame
             while (mWindow.pollEvent(event)) {
                 if (event.type == sf::Event::Closed) {
                     mWindow.close();
@@ -251,7 +291,7 @@ namespace i_2D {
                     }
 
                 } else if (event.type == sf::Event::KeyPressed) {
-                    return HandleKeyEvent(event);
+                    action_id = HandleKeyEvent(event);
 
                 } else if (event.type == sf::Event::Resized) {
                     HandleResize(event, grid);
@@ -262,17 +302,20 @@ namespace i_2D {
                 } else if (event.type == sf::Event::MouseButtonPressed) {
                     MouseClickEvent(event);
 
-
-
-                } else if (event.type == sf::Event::MouseWheelScrolled) {
-//                    HandleScroll(event);
                 }
             }
 
+            // Check if a valid action was taken and return that if so
+            if(action_id != 0)
+            {
+                return action_id;
+            }
+
+            // Otherwise update the screen drawing again...
             DrawGrid(grid, type_options, item_map, agent_map);
 
         }
-
+        // The timer has ended or the window has been closed
         return 0;
     }
 
@@ -309,14 +352,6 @@ namespace i_2D {
                 if (mTextBox->IsSelected())break;
                 action_id = GetActionID("up");
                 break;
-//            case sf::Keyboard::Y:
-//                if (mTextBox->IsSelected())break;
-//                action_id = GetActionID("Y");
-//                break;
-//            case sf::Keyboard::N:
-//                if (mTextBox->IsSelected())break;
-//                action_id = GetActionID("N");
-//                break;
             case sf::Keyboard::A:
                 if (mTextBox->IsSelected())break;
                 action_id = GetActionID("left");
@@ -341,16 +376,11 @@ namespace i_2D {
             case sf::Keyboard::Right:
                 action_id = GetActionID("right");
                 break;
-
-//            case sf::Keyboard::Q:
-//                exit(0);
-//            case sf::Keyboard::Escape:
-//                exit(0);
             default:
                 break; // The user pressed an unknown key.
         }
         // If we waited for input, but don't understand it, notify the user.
-        if (action_id == 0) {
+        if (action_id == 0 && !mTextBox->IsSelected()) {
             std::cout << "Unknown key." << std::endl;
         }
         // Do the action!
@@ -383,7 +413,7 @@ namespace i_2D {
         heightWindow = std::max(heightWindow, heightMin);
 
         mMenu.SetWorldSize(sf::Vector2f(widthWindow, heightWindow));
-        if(mMenu.IsInventoryOpen()){
+        if (mMenu.IsInventoryOpen()) {
             mMenu.DeconstructInventory();
             mMenu.ConstructInventory();
         }
@@ -398,41 +428,17 @@ namespace i_2D {
 
         // Update TextBox position for resizing
         if (mTextBox) {
-            mTextBox->SetPosition({10, 800});
-//            mTextBox->DrawTo(mWindow);
-        }
-    }
+            // Define the percentage values for the position
+            float xPosPercentage = 0.01f; // 5% of the window width
+            float yPosPercentage = 0.9f;  // 80% of the window height
 
-    /**
-     * @brief Draw the wall texture based on the provided parameters.
-     *
-     * @param cellRect The rectangle shape of the cell.
-     * @param wallTexture The texture for the wall.
-     * @param isVerticalWall for vertical wall
-    */
-    void MainInterface::DrawWall(sf::RectangleShape &cellRect, sf::Texture &wallTexture) {
+            // Calculate the actual position based on percentages
+            float xPos = (widthWindow * xPosPercentage);
+            float yPos = (heightWindow* yPosPercentage);
 
-        cellRect.setTexture(&mTextureHolder.GetTexture("wallTexture"));
-        mWindow.draw(cellRect);
-    }
-
-    /**
-     * @brief Draw the cell with Agent texture and specified color.
-     * @param cellRect The rectangle shape of the cell.
-     * @param cell The rectangle shape for the cell.
-     * @param agent The agent texture.
-     * @param color The color to be set for the cell.
-     */
-
-    void MainInterface::DrawAgentCell(sf::RectangleShape &cellRect, sf::RectangleShape &cell, sf::Texture &agent) {
-        cellRect.setTexture(&agent);
-        cell.setTexture(&mTexturesCurrent[' ']);
-        if(&agent == &mTexturesCurrent['+'])
-        {
-            cellRect.setFillColor(sf::Color::Green);
+            // Set the position of your textbox
+            mTextBox->SetPosition({ xPos, yPos});
         }
-        mWindow.draw(cell);
-        mWindow.draw(cellRect);
     }
 
     /*
@@ -456,23 +462,6 @@ namespace i_2D {
 
     }
 
-    /**
-     * This is a helper function for DrawGrid. jsut using the switch statement to draw the grids
-     * @param cellRect - cell for texture
-     * @param cell  - cell for the solid
-     * @param symbol  - symbol of the cell
-     * @param isVerticalWall  - to the wall
-     */
-    void MainInterface::SwitchCellSelect(sf::RectangleShape &cellRect, sf::RectangleShape &cell, char symbol) {
-        switch (symbol) {
-            case '#':
-                DrawWall(cellRect, mTexturesCurrent[symbol]);
-                break;
-            default:
-                DrawAgentCell(cellRect, cell, mTexturesCurrent[symbol]);
-                break;
-        }
-    }
     /**
      * this function handles mouseclick event
      * @param event for mouse click
@@ -491,10 +480,10 @@ namespace i_2D {
             }
 
             // Check if the mouse is over specific menu items
-            if (mMenu.GetMenu()[3]->isMouseOver(mWindow)) {
-                mGridSizeLarge = false;
-            } else if (mMenu.GetMenu()[4]->isMouseOver(mWindow)) {
+            if (mMenu.GetMenu()[4]->isMouseOver(mWindow) or (mGridWidth == mGridHeight and mGridWidth > ROW)){
                 mGridSizeLarge = true;
+            } else if (mMenu.GetMenu()[3]->isMouseOver(mWindow)) {
+                mGridSizeLarge = false;
             } else {
                 // Handle mouse button press for the general menu
                 mMenu.HandleMouseButtonPressed(mWindow);
@@ -502,7 +491,60 @@ namespace i_2D {
         }
     }
 
+    /**
+    * This is a helper function for DrawGrid. jsut using the switch statement to draw the grids
+    * @param cellRect - cell for texture
+    * @param cell  - cell for the solid
+    * @param symbol  - symbol of the cell
+    * @param renderTexture  - Texture for teh whole grid
+    */
+    void MainInterface::SwitchCellSelect(sf::RenderTexture &renderTexture, sf::RectangleShape &cellRect,
+                                         sf::RectangleShape &cell, char symbol) {
+        switch (symbol) {
+            case '#':
+                DrawWall(renderTexture, cellRect, mTexturesCurrent[symbol]);
+                break;
+            default:
+                DrawAgentCell(renderTexture, cellRect, cell, mTexturesCurrent[symbol]);
+                break;
+        }
+    }
+
+    /**
+     * @brief Draw the cell with Agent texture and specified color.
+     * @param cellRect The rectangle shape of the cell.
+     * @param cell The rectangle shape for the cell.
+     * @param agent The agent texture.
+     * @param renderTexture The Texture for the whole grid.
+     */
+    void MainInterface::DrawAgentCell(sf::RenderTexture &renderTexture, sf::RectangleShape &cellRect,
+                                      sf::RectangleShape &cell, sf::Texture &agent) {
+        cellRect.setTexture(&agent);
+        cell.setTexture(&mTexturesCurrent[' ']);
+        if (&agent == &mTexturesCurrent['+'] and GetName() == "Interface") {
+            cellRect.setFillColor(sf::Color::Green);
+        }
+        renderTexture.draw(cell);
+        renderTexture.draw(cellRect);
+    }
 
-}
+    /**
+     * @brief Draw the wall texture based on the provided parameters.
+     *
+     * @param cellRect The rectangle shape of the cell.
+     * @param wallTexture The texture for the wall.
+     * @param renderTexture The Texture for the whole grid
+    */
+
+    void
+    MainInterface::DrawWall(sf::RenderTexture &renderTexture, sf::RectangleShape &cellRect, sf::Texture &wallTexture) {
+        cellRect.setTexture(&wallTexture);
+        renderTexture.draw(cellRect);
+    }
+
+    void MainInterface::setMInputWaitTime(double waitTime) {
+        MainInterface::mInputWaitTime = waitTime;
+    }
 
 
+}
diff --git a/source/Interfaces/MainInterface.hpp b/source/Interfaces/MainInterface.hpp
index 808c920b..8783f4bd 100644
--- a/source/Interfaces/MainInterface.hpp
+++ b/source/Interfaces/MainInterface.hpp
@@ -48,7 +48,6 @@ namespace i_2D {
         sf::Font mFont; ///< one font for all objects using font
         std::unique_ptr<TextBox> mTextBox; /// for chatting and possible event handling by text
         std::unique_ptr<MessageBoard> mMessageBoard;
-//        std::unique_ptr<Button> mTestButton;
 
         // Texture vars
         TextureHolder mTextureHolder; ///< for the texture holder
@@ -64,6 +63,13 @@ namespace i_2D {
         int const ROW = 9;
         int const COL = 23;
 
+        int mGridWidth  = 0;
+        int mGridHeight = 0;
+
+        double mInputWaitTime = 0.5f;
+    public:
+        void setMInputWaitTime(double mInputWaitTime);
+
     public:
 
         MainInterface(size_t id, const std::string &name) ;
@@ -75,10 +81,10 @@ namespace i_2D {
 
 
         std::vector<std::string> CreateVectorMaze(
-          const WorldGrid &grid,
-          const type_options_t &type_options,
-          const item_map_t &item_map,
-          const agent_map_t &agent_map) ;
+                const WorldGrid &grid,
+                const type_options_t &type_options,
+                const item_map_t &item_map,
+                const agent_map_t &agent_map) ;
 
         void DrawGrid(const WorldGrid &grid, const type_options_t &type_options,
                       const item_map_t &item_map, const agent_map_t &agent_map);
@@ -98,12 +104,6 @@ namespace i_2D {
 
         size_t HandleKeyEvent(const sf::Event &event);
 
-        void DrawWall(sf::RectangleShape &cellRect, sf::Texture &wallTexture);
-
-
-        void DrawAgentCell(sf::RectangleShape &cellRect, sf::RectangleShape &cell, sf::Texture &agent);
-
-
         void CalculateDrawSpace(const WorldGrid &grid, float cellSize, float &drawSpaceWidth, float &drawSpaceHeight,
                                 float &drawCenterX, float &drawCenterY);
 
@@ -112,7 +112,6 @@ namespace i_2D {
         void HandleResize(const sf::Event &event, const WorldGrid &grid);
 
         void ChooseTexture();
-        void SwitchCellSelect(sf::RectangleShape& cellRect,sf::RectangleShape& cell, char symbol);
 
         void Notify(const std::string & message,
                     const std::string & /*msg_type*/="none") override
@@ -123,6 +122,19 @@ namespace i_2D {
         std::vector<std::string> LargeDisplayGrid(const std::vector<std::string> &symbol_grid);
 
         void MouseClickEvent(const sf::Event &event);
+
+        void DrawAgentCell(sf::RenderTexture &renderTexture, sf::RectangleShape &cellRect, sf::RectangleShape &cell,
+                           sf::Texture &agent);
+
+        void
+        SwitchCellSelect(sf::RenderTexture &renderTexture, sf::RectangleShape &cellRect, sf::RectangleShape &cell,
+                         char symbol);
+
+        void DrawWall(sf::RenderTexture &renderTexture, sf::RectangleShape &cellRect, sf::Texture &wallTexture);
+
+        void DrawTimer();
+
+        void DrawHealthInfo();
     };
 
 } // End of namespace 2D
diff --git a/source/Interfaces/TextBox.cpp b/source/Interfaces/TextBox.cpp
index c34413f5..9ca603d4 100644
--- a/source/Interfaces/TextBox.cpp
+++ b/source/Interfaces/TextBox.cpp
@@ -36,6 +36,10 @@ void i_2D::TextBox::SetString(const std::string &s) {
     mText << s;
 }
 
+/***
+ * @brief Setter for isSelected, updates the text displayed in the box
+ * @param sel whether the TextBox is to be set selected or not
+ */
 void i_2D::TextBox::SetSelected(bool sel) {
     isSelected = sel;
     if(!sel){
@@ -48,6 +52,10 @@ void i_2D::TextBox::SetSelected(bool sel) {
     }
 }
 
+/***
+ * @brief TypedOn event handler
+ * @param input the new text that has been typed into the TextBox
+ */
 void i_2D::TextBox::TypedOn(sf::Event input) {
     if(isSelected){
         int charTyped = static_cast<int>(input.text.unicode);
@@ -65,6 +73,10 @@ void i_2D::TextBox::TypedOn(sf::Event input) {
     }
 }
 
+/***
+ * @brief Determines what actions to take with different key presses
+ * @param charTyped The character that has just been entered into the TextBox
+ */
 void i_2D::TextBox::InputLogic(int charTyped) {
     if(isSelected)
     {
@@ -91,6 +103,9 @@ void i_2D::TextBox::InputLogic(int charTyped) {
     mTextBox->setString(mText.str() + "_");
 }
 
+/**
+ * @brief removes the last character from the TextBox's current string
+ */
 void i_2D::TextBox::DeleteLastChar() {
     std::string t = mText.str();
     std::string newT;
@@ -111,6 +126,7 @@ void i_2D::TextBox::DrawTo(sf::RenderWindow &window){
     mBorderRect.setSize(sf::Vector2f(800, 50));
     //Subtracts the vector (5, 5) from the position of mTextBox. This creates a new position
     // slightly to the left and up from the original position, effectively creating a margin.
+
     mBorderRect.setPosition(mTextBox->getPosition() - sf::Vector2f(5, 5));
     mBorderRect.setFillColor(sf::Color(200, 200, 200));
     mBorderRect.setOutlineThickness(2.0f);  //  thickness of the border
diff --git a/source/Interfaces/TextBox.hpp b/source/Interfaces/TextBox.hpp
index 794eceaa..0701b8b5 100644
--- a/source/Interfaces/TextBox.hpp
+++ b/source/Interfaces/TextBox.hpp
@@ -88,6 +88,11 @@ namespace i_2D {
             return isSelected;
         }
 
+        /**
+         * @brief Checks if a point is within the TextBox
+         * @param point an xy point to check the location of
+         * @return True if the point is in bounds, False otherwise
+         */
         bool Contains(sf::Vector2f point) const {
             return mBorderRect.getGlobalBounds().contains(point);
         }
diff --git a/source/Interfaces/TextureHolder.cpp b/source/Interfaces/TextureHolder.cpp
index 9858178b..6c2dc3b7 100644
--- a/source/Interfaces/TextureHolder.cpp
+++ b/source/Interfaces/TextureHolder.cpp
@@ -34,11 +34,11 @@ namespace i_2D
     const sf::Texture &TextureHolder::GetTexture(std::string id) {
         // Find iterator of matching id (avoids copy of unique_ptr)
         auto got = textures_.find(id);
-        // Return dereferenced unique_ptr found at iterator pair
+        // Return dereference unique_ptr found at iterator pair
         return *got->second;
     }
 
-    /*
+    /**
      * @brief This function loads texture for the maze world images - Default maze
      * @return std::map< name, texture> returns the map, key is the name of the texture and values is the actual texture
      */
@@ -57,7 +57,7 @@ namespace i_2D
         textures['@'] = GetTexture("agentTexture");
         return textures;
     }
-    /*
+    /**
      * @brief This function loads texture for the second world images group 4
      * @return std::map< name, texture> returns the map, key is the name of the texture and values is the actual texture
      */
@@ -77,6 +77,7 @@ namespace i_2D
         LoadTexture("chestTexture", "../assets/weapons/chest_closed.png");
         LoadTexture("flagTexture", "../assets/weapons/flag.png");
         LoadTexture("pathTexture", "../assets/Ground_tiles/Grass2.png");
+
         textures['#'] = GetTexture("wallTexture");
         textures['*'] = GetTexture("trollTexture");
         textures['@'] = GetTexture("agentTexture");
@@ -87,9 +88,10 @@ namespace i_2D
         textures['C'] = GetTexture("chestTexture");
         textures['g'] = GetTexture("flagTexture");
         textures[' '] = GetTexture("pathTexture");
+
         return textures;
     }
-    /*
+    /**
      * @brief This function loads texture for the manual world images group 8
      * @return std::map< name, texture> returns the map, key is the name of the texture and values is the actual texture
      */
@@ -107,6 +109,8 @@ namespace i_2D
         LoadTexture("axeTexture", "../assets/weapons/w_axe_war_steel.png");
         LoadTexture("boatTexture", "../assets/weapons/Boat_color1_2.png");
         LoadTexture("pathTexture", "../assets/Ground_tiles/Sand1.png");
+        LoadTexture("portal1Texture", "../assets/walls/portal1.png");
+        LoadTexture("portal2Texture", "../assets/walls/portal2.png");
         textures['P'] = GetTexture("axeTexture");
         textures['U'] = GetTexture("boatTexture");
         textures['#'] = GetTexture("wallTexture");
@@ -115,11 +119,12 @@ namespace i_2D
         textures['^'] = GetTexture("treeTexture");
         textures['~'] = GetTexture("waterTexture");
         textures[' '] = GetTexture("pathTexture");
-
+        textures['{'] = GetTexture("portal1Texture");
+        textures['}'] = GetTexture("portal2Texture");
 
         return textures;
     }
-    /*
+    /**
      * @brief This function loads texture for the generative world images group 6
      * @return std::map< name, texture> returns the map, key is the name of the texture and values is the actual texture
      */
@@ -137,6 +142,19 @@ namespace i_2D
         LoadTexture("spikeTexture", "../assets/weapons/Individual_Spike.png");
         LoadTexture("keyTexture", "../assets/weapons/key.png");
         LoadTexture("pathTexture", "../assets/Ground_tiles/Dirt1.png");
+        LoadTexture("bootTexture", "../assets/weapons/2.png");
+        LoadTexture("shieldTexture", "../assets/weapons/shield.png");
+        LoadTexture("teleportTexture", "../assets/walls/teleport.png");
+        LoadTexture("armoryTexture", "../assets/weapons/steel_armor.png");
+        LoadTexture("waterTexture", "../assets/Ground_tiles/water.jpg");
+        LoadTexture("sandTexture", "../assets/Ground_tiles/Sand1.png");
+        LoadTexture("grassTexture", "../assets/Ground_tiles/Grass2.png");
+        LoadTexture("dirtTexture", "../assets/Ground_tiles/Dirt1.png");
+        textures['~'] = GetTexture("dirtTexture");
+        textures['M'] = GetTexture("grassTexture");
+        textures['-'] = GetTexture("sandTexture");
+        textures['W'] = GetTexture("waterTexture");
+        textures['B'] = GetTexture("bootTexture");
         textures['X'] = GetTexture("spikeTexture");
         textures['O'] = GetTexture("tarTexture");
         textures['#'] = GetTexture("wallTexture");
@@ -145,6 +163,9 @@ namespace i_2D
         textures['D'] = GetTexture("doorTexture");
         textures['K'] = GetTexture("keyTexture");
         textures[' '] = GetTexture("pathTexture");
+        textures['S'] = GetTexture("shieldTexture");
+        textures['T'] = GetTexture("teleportTexture");
+        textures['A'] = GetTexture("armoryTexture");
 
         return textures;
     }
diff --git a/source/group_3_main.cpp b/source/group_3_main.cpp
index 7972535f..18b23a10 100644
--- a/source/group_3_main.cpp
+++ b/source/group_3_main.cpp
@@ -23,7 +23,7 @@ int main() {
 //     group 4 maze -1
     group4::SecondWorld world_1;
 
-    world_1.AddAgent<i_2D::MainInterface>("Interface").SetProperty<char>("symbol", '@');
+    world_1.AddAgent<i_2D::MainInterface>("Interface", "Health", 5).SetProperty<char>("symbol", '@');
 
     // Adding power sword with id = 1; name = sword of power
     auto powerSword = std::make_unique<cse491::ItemBase>(1, "Sword of Power");
@@ -58,7 +58,7 @@ int main() {
     world_2.AddAgent<cse491::PacingAgent>("Pacer 2").SetPosition(6, 1);
     world_2.AddAgent<i_2D::MainInterface>("Interface2").SetProperty("symbol", '@');
 
-//    world_2.Run();
+    world_2.Run();
 
     cse491_team8::ManualWorld world_3;
     world_3.AddItem("Axe", "Chop", 5, "symbol", 'P').SetPosition(37, 3);