diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp
index ccca0d67..fc5b68e1 100644
--- a/src/Engine/Network/Client.cpp
+++ b/src/Engine/Network/Client.cpp
@@ -203,6 +203,8 @@ void Client::parseServerlist(Packet& packet)
     std::string serverName = packet.ReadString();
     int playersConnected = packet.ReadPrimitive<int>();
     //TODO: This should not happen when a client is connected to a server
+    LOG_INFO("Parsing a server list!");
+
     m_Serverlist.push_back({ address, port, serverName, playersConnected });
 }
 
diff --git a/src/Engine/Network/Server.cpp b/src/Engine/Network/Server.cpp
index 4b83967e..157f74dd 100644
--- a/src/Engine/Network/Server.cpp
+++ b/src/Engine/Network/Server.cpp
@@ -401,7 +401,7 @@ void Server::parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint)
     packet.WritePrimitive<int>(m_ConnectedPlayers.size());
     //PlayerDefinition pDef;
     //pDef.Endpoint = boost::asio::ip::udp::endpoint(endpoint.address(), 13);
-
+    LOG_INFO("Parsing a server list request!");
     m_ServerlistRequest.Send(packet/*, endpoint*/);
 }
 
diff --git a/src/Engine/Network/UDPClient.cpp b/src/Engine/Network/UDPClient.cpp
index f31d5a17..37b9b1a0 100644
--- a/src/Engine/Network/UDPClient.cpp
+++ b/src/Engine/Network/UDPClient.cpp
@@ -91,6 +91,7 @@ void UDPClient::Send(Packet& packet)
 
 void UDPClient::Broadcast(Packet& packet, int port)
 {
+    packet.UpdateSize();
     m_Socket->set_option(boost::asio::socket_base::broadcast(true));
     m_Socket->send_to(boost::asio::buffer(
         packet.Data(),
diff --git a/src/Engine/Network/UDPServer.cpp b/src/Engine/Network/UDPServer.cpp
index fcf26aec..2f941b04 100644
--- a/src/Engine/Network/UDPServer.cpp
+++ b/src/Engine/Network/UDPServer.cpp
@@ -41,6 +41,7 @@ void UDPServer::Send(Packet & packet)
 // Broadcasting respond specific logic
 void UDPServer::Send(Packet & packet, boost::asio::ip::udp::endpoint endpoint)
 {
+    packet.UpdateSize();
     m_Socket->send_to(
         boost::asio::buffer(
             packet.Data(),
@@ -52,6 +53,7 @@ void UDPServer::Send(Packet & packet, boost::asio::ip::udp::endpoint endpoint)
 // Broadcasting
 void UDPServer::Broadcast(Packet & packet, int port)
 {
+    packet.UpdateSize();
     m_Socket->set_option(boost::asio::socket_base::broadcast(true));
     m_Socket->send_to(
         boost::asio::buffer(
@@ -68,6 +70,7 @@ void UDPServer::Receive(Packet & packet, PlayerDefinition & playerDefinition)
     if (bytesRead > 0) {
         packet.ReconstructFromData(m_ReadBuffer, bytesRead);
     }
+    LOG_INFO("Received server list msg");
     playerDefinition.Endpoint = m_ReceiverEndpoint;
 }
 
@@ -90,6 +93,7 @@ int UDPServer::readBuffer()
     if (!m_Socket) {
         return 0;
     }
+    int addasdasd = m_Socket->available();
     boost::system::error_code error;
     // Read size of packet
      m_Socket->receive_from(boost