diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index a243c64..a6a2796 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -94,10 +94,14 @@ void ClientInitializeGame(uint32_t mapId, C3Vector position) {
     ClientServices::SetMessageHandler(SMSG_TRANSFER_PENDING, TransferPendingHandler, nullptr);
     ClientServices::SetMessageHandler(SMSG_TRANSFER_ABORTED, TransferAbortedHandler, nullptr);
     ClientServices::SetMessageHandler(SMSG_LOGIN_VERIFY_WORLD, LoginVerifyWorldHandler, nullptr);
-
     ClientServices::SetMessageHandler(SMSG_KICK_REASON, CGlueMgr::OnKickReasonMsg, nullptr);
 
     // TODO
+
+    auto mapRec = g_mapDB.GetRecord(mapId);
+    CWorld::LoadMap(mapRec->m_directory, position, mapId);
+
+    // TODO
 }
 
 void ClientRegisterConsoleCommands() {