diff --git a/.gitignore b/.gitignore
index f0c1c5a..3569aab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -373,3 +373,5 @@ FodyWeavers.xsd
 /x64/Release/SQCSim2023.exe
 /x64/Debug/SQCSim2023.exe
 /x64/Debug/SQCSim2021.pdb
+/SQCSim-srv/cmake/*
+!/SQCSim-srv/cmake/CMakeLists.txt
diff --git a/SQCSim-common/define.h b/SQCSim-common/define.h
index f02d719..c7e6cb7 100644
--- a/SQCSim-common/define.h
+++ b/SQCSim-common/define.h
@@ -53,6 +53,7 @@ typedef uint64_t Timestamp;
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
+#include <cstring>
 
 #define SOCKET int
 #define INVALID_SOCKET -1
diff --git a/SQCSim-srv/cmake/CMakeLists.txt b/SQCSim-srv/cmake/CMakeLists.txt
new file mode 100644
index 0000000..2c9eba6
--- /dev/null
+++ b/SQCSim-srv/cmake/CMakeLists.txt
@@ -0,0 +1,29 @@
+cmake_minimum_required(VERSION 3.18.4)
+
+project(SQCSim-Server VERSION 0.1)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_STANDARD_REQUIRED True)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../out")
+
+set(SQCSIM_COMMON_DIR "../../SQCSim-common/")
+
+add_library(SQCSim-common
+			"${SQCSIM_COMMON_DIR}blockinfo.cpp"
+			"${SQCSIM_COMMON_DIR}bullet.cpp"
+			"${SQCSIM_COMMON_DIR}chunk.cpp"
+			"${SQCSIM_COMMON_DIR}netprotocol.cpp"
+			"${SQCSIM_COMMON_DIR}opensimplex.cpp"
+			"${SQCSIM_COMMON_DIR}player.cpp"
+			"${SQCSIM_COMMON_DIR}transformation.cpp"
+			"${SQCSIM_COMMON_DIR}world.cpp"
+)
+
+add_executable(SQCSim-server
+			"../connection.cpp"
+			"../server.cpp"
+			"../main.cpp"
+			)
+
+target_link_libraries(SQCSim-server PUBLIC SQCSim-common)
diff --git a/SQCSim-srv/define.h b/SQCSim-srv/define.h
index 77ca08e..626a26a 100644
--- a/SQCSim-srv/define.h
+++ b/SQCSim-srv/define.h
@@ -14,4 +14,4 @@
 typedef unsigned char LogDest;
 enum LOG_DEST { CONSOLE, LOGFILE, LOG_LAST };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/SQCSim-srv/server.cpp b/SQCSim-srv/server.cpp
index 17c5585..cbda844 100644
--- a/SQCSim-srv/server.cpp
+++ b/SQCSim-srv/server.cpp
@@ -85,7 +85,7 @@ int Server::Ready() {
 
 	while (!readystart) {
 		sockaddr_in sockad;
-		int addrlen = sizeof(sockad);
+		unsigned int addrlen = sizeof(sockad);
 		SOCKET sock = accept(m_sock_tcp, (sockaddr*)&sockad, &addrlen);
 
 		if (sock < 0)
@@ -140,7 +140,7 @@ void Server::Run() {
 	Log("Partie en cours...", false, false);
 }
 
-inline std::string Server::Timestamp() {
+inline std::string Server::LogTimestamp() {
 	time_t rawtime;
 	struct tm timeinfo;
 	char buffer[80];
@@ -162,11 +162,11 @@ inline std::string Server::Timestamp() {
 void Server::Log(std::string str, bool is_error = false, bool is_fatal = false) {
 	switch (m_log) {
 	case LOG_DEST::LOGFILE:
-		m_logfile << Timestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
+		m_logfile << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
 		break;
 	case LOG_DEST::CONSOLE:
 	default:
-		std::cout << Timestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
+		std::cout << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
 		break;
 	}
 
diff --git a/SQCSim-srv/server.h b/SQCSim-srv/server.h
index 425a996..6c77038 100644
--- a/SQCSim-srv/server.h
+++ b/SQCSim-srv/server.h
@@ -35,7 +35,7 @@ private:
 
 	World* m_world = nullptr;
 
-	std::string Timestamp();
+	std::string LogTimestamp();
 	void Log(std::string str, bool is_error, bool is_fatal);
 	void buildIdList(size_t size);
 
diff --git a/SQCSim2021/docs/analyse_preliminaire.md b/SQCSim2021/docs/analyse_preliminaire.md
new file mode 100644
index 0000000..e69de29
diff --git a/SQCSim2021/docs/analyse_serveur.md b/SQCSim2021/docs/analyse_serveur.md
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/SQCSim2021/docs/analyse_serveur.md
@@ -0,0 +1 @@
+