diff --git a/code/server/Server/Program.cs b/code/server/Server/Program.cs
index e53bd7c..5af62b4 100644
--- a/code/server/Server/Program.cs
+++ b/code/server/Server/Program.cs
@@ -1,66 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-using DataBase.Entity;
-
-class Program
-{
-    static Dictionary<IPEndPoint, UdpClient> clients = new Dictionary<IPEndPoint, UdpClient>();
-    static int nextPort = 3132;
-
-    static void Main(string[] args)
-    {
-        Console.WriteLine("Welcome to LeapHit Multiplayer - Server");
-        StartServer();
-    }
-
-    static void StartServer()
-    {
-        IPEndPoint serverEndPoint = new IPEndPoint(IPAddress.Any, 3131);
-        UdpClient serverSocket = new UdpClient(serverEndPoint);
-        Console.WriteLine("Server started, waiting for clients to connect...");
-
-        while (true)
-        {
-            IPEndPoint remoteEndPoint = new IPEndPoint(IPAddress.Any, 0);
-            byte[] receivedData = serverSocket.Receive(ref remoteEndPoint);
-            string message = Encoding.ASCII.GetString(receivedData);
-
-            if (message == "Connect")
-            {
-                Console.WriteLine("New connection from " + remoteEndPoint.ToString());
-
-                // Assign a unique port to the client
-                IPEndPoint clientEndPoint = new IPEndPoint(IPAddress.Any, nextPort++); ;
-                UdpClient clientSocket = new UdpClient(clientEndPoint);
-                clients[remoteEndPoint] = clientSocket;
-
-                // Send connection message to client
-                string connectionMessage = clientEndPoint.Port.ToString();
-                byte[] connectionData = Encoding.ASCII.GetBytes(connectionMessage);
-                serverSocket.Send(connectionData, connectionData.Length, remoteEndPoint);
-
-                // Start thread to receive data from client
-                Thread receiveThread = new Thread(()=>ReceiveMessages(clientSocket));
-                receiveThread.Start();
-                
-            }
-        }
-    }
-
-    static void ReceiveMessages(UdpClient clientSocket)
-    {
-        IPEndPoint remoteEndPoint = new IPEndPoint(IPAddress.Any, 0);
-
-        while (true)
-        {
-            byte[] receivedData = clientSocket.Receive(ref remoteEndPoint);
-            string receivedMessage = Encoding.ASCII.GetString(receivedData);
-            Console.WriteLine("Received from " + remoteEndPoint.ToString() + ": " + receivedMessage);
-
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading;
+using DataBase.Entity;
+using Shared.DTO;
+using System.Text.Json;
+using Server;
+
+class Program
+{
+    static void Main(string[] args)
+    {
+        PongServer server = new PongServer();
+        Console.WriteLine("Welcome to LeapHit Multiplayer - Server");
+        server.StartServer();
+    }
+
 }
\ No newline at end of file