diff --git a/SQCSim-common/player.h b/SQCSim-common/player.h
index d592613..757528b 100644
--- a/SQCSim-common/player.h
+++ b/SQCSim-common/player.h
@@ -28,6 +28,8 @@ public:
 	float GetHP() const;
 	void Teleport(int& x, int& z);
 
+	uint64_t getId() const;
+
 protected:
 	Vector3f m_position;
 	Vector3f m_velocity;
diff --git a/SQCSim2021/engine.cpp b/SQCSim2021/engine.cpp
index 40de73a..5fdc85e 100644
--- a/SQCSim2021/engine.cpp
+++ b/SQCSim2021/engine.cpp
@@ -772,9 +772,9 @@ void Engine::Render(float elapsedTime) {
 		}
 	}
 
-		m_wrenderer.RenderWorld(&m_world, m_renderCount, m_player.GetPosition(), m_player.GetDirection(), all, m_shader01, m_textureAtlas);
+		m_renderer.RenderWorld(&m_world, m_renderCount, m_player.GetPosition(), m_player.GetDirection(), all, m_shader01, m_textureAtlas);
 		m_world.Update(m_bullets, m_player.GetPosition(), m_blockinfo);
-		m_wrenderer.UpdateWorld(&m_world, m_player.GetPosition(), m_blockinfo);
+		m_renderer.UpdateMesh(&m_world, m_player.GetPosition(), m_blockinfo);
 
 		if (m_isSkybox) m_skybox.Render(skybox);
 
diff --git a/SQCSim2021/engine.h b/SQCSim2021/engine.h
index 6e41b9f..09a2314 100644
--- a/SQCSim2021/engine.h
+++ b/SQCSim2021/engine.h
@@ -19,6 +19,7 @@
 #include "textureatlas.h"
 #include "connector.h"
 #include "renderer.h"
+#include "remoteplayer.h"
 
 class Engine : public OpenglContext {
 public:
@@ -79,8 +80,10 @@ private:
     
     Bullet* m_bullets[MAX_BULLETS];
 
+    std::map<uint64_t, RemotePlayer*> m_players;
+
     //Menu
-    enum class GameState { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY };
+    enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY };
     GameState m_gamestate = GameState::MAIN_MENU;
     Texture MenuTitleTexture,
             MenuBGTexture,