diff --git a/SMTPServer/.vs/STMPServer/DesignTimeBuild/.dtbcache.v2 b/SMTPServer/.vs/STMPServer/DesignTimeBuild/.dtbcache.v2
index 26bea86c5e4e340c601f620cd88ed7f43b26b177..6c21315b9c6b21cb11139d57c865dfb8a18d9449 100644
Binary files a/SMTPServer/.vs/STMPServer/DesignTimeBuild/.dtbcache.v2 and b/SMTPServer/.vs/STMPServer/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/SMTPServer/.vs/STMPServer/v16/.suo b/SMTPServer/.vs/STMPServer/v16/.suo
index c7ad3582f882ba3e342c7879ae44ef93562bdb54..b3ddfd8fb27c60fe59a6055f318c6af2e429529b 100644
Binary files a/SMTPServer/.vs/STMPServer/v16/.suo and b/SMTPServer/.vs/STMPServer/v16/.suo differ
diff --git a/SMTPServer/STMPServer/Program.cs b/SMTPServer/STMPServer/Program.cs
index d0c76dcf3ae7e15eef3d1aca418f34c65490b9af..c876e6a7da1a608027d98036d95e51ac6498f0a9 100644
--- a/SMTPServer/STMPServer/Program.cs
+++ b/SMTPServer/STMPServer/Program.cs
@@ -12,7 +12,9 @@ namespace STMPServer
         static void Main(string[] args)
         {
             //int[] ports = new int[] { 25000, 110 };
-            int[] ports = new int[] { 110 }; // testing purposes
+            int[] ports = new int[] { 25000 }; // testing purposes
+            string[] inbox = new string[1];
+
             for (int i = 0; i < ports.Length; i++)
             {
                 Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
@@ -22,12 +24,14 @@ namespace STMPServer
                 // Kuinka monta asiakasta saa olla 
                 socket.Listen(1);
                 bool while_on = true;
+                string mail;
                 Console.WriteLine("SMTP Palvelin käynnissä portissa: " + ports[i]);
 
                 while (while_on)
                 {
                     // Tähän joku timeout ??
-                    HandleSMTPClient(socket);
+                    mail = HandleSMTPClient(socket);
+                    if(mail != "") { inbox[0] = mail; }
                     //HandlePOP3Client(socket);
                 }
                 Console.ReadKey();
@@ -198,7 +202,7 @@ namespace STMPServer
             return tila;
         }
 
-        static void HandleSMTPClient(Socket socket)
+        static string HandleSMTPClient(Socket socket)
         {
             Socket asiakas = socket.Accept();
             string ip = ((IPEndPoint)(asiakas.RemoteEndPoint)).Address.ToString();
@@ -208,6 +212,8 @@ namespace STMPServer
             asiakas.Send(Encoding.UTF8.GetBytes("220 TIES323 Postipalvelin\r\n"));
             bool keskustelu = true;
             bool data_vipu = false;
+            string mail = "";
+
             while (keskustelu)
             {
                 byte[] buffer = new byte[2048];
@@ -222,7 +228,8 @@ namespace STMPServer
                 int tila = 0;
                 if (data_vipu)
                 {
-                    tila = ValidoiData(lines, asiakas);
+                    mail = ValidoiData(lines, asiakas);
+                    tila = 0;
                 }
                 else
                 {
@@ -242,6 +249,7 @@ namespace STMPServer
                         break;
                 }
             }
+            return mail;
         }
 
         static int ValidoiVastaus(string vastaus, Socket socket, bool data_vipu)
@@ -277,19 +285,25 @@ namespace STMPServer
             return tila;
         }
 
-        static int ValidoiData(string[] arr, Socket socket)
+        static string ValidoiData(string[] arr, Socket socket)
         {
             string[] data;
+            string mail = "";
+
             for(int i = 0; i < arr.Length - 1; i++)
             {
                 if(arr[i] == ".")
                 {
                     string msg = "250 2.0.0 Message displayed on Server Screen.";
                     VastaaAsiakas(msg, socket);
-                    return 0;
+                    return mail;
+                }
+                else
+                {
+                    mail = mail + arr[i] + " ";
                 }
             }
-            return 1;
+            return mail;
         }
 
         static void VastaaAsiakas(string msg, Socket asiakas)
diff --git a/SMTPServer/STMPServer/bin/Debug/netcoreapp3.1/STMPServer.dll b/SMTPServer/STMPServer/bin/Debug/netcoreapp3.1/STMPServer.dll
index 6ee31abf9275ece9404f513b7cab5fc4c513c936..e117101410faaa0c1bfcbf51b29842900d41aa31 100644
Binary files a/SMTPServer/STMPServer/bin/Debug/netcoreapp3.1/STMPServer.dll and b/SMTPServer/STMPServer/bin/Debug/netcoreapp3.1/STMPServer.dll differ
diff --git a/SMTPServer/STMPServer/bin/Debug/netcoreapp3.1/STMPServer.pdb b/SMTPServer/STMPServer/bin/Debug/netcoreapp3.1/STMPServer.pdb
index b55ef6297e060cea8925d05aaab2518797f8e85d..2b6ac083e5d73bfe9b47152c1407019e54503571 100644
Binary files a/SMTPServer/STMPServer/bin/Debug/netcoreapp3.1/STMPServer.pdb and b/SMTPServer/STMPServer/bin/Debug/netcoreapp3.1/STMPServer.pdb differ
diff --git a/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.assets.cache b/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.assets.cache
index 819a19a2976978f35c487c834db58f6992f1ac28..123dfa35d4c1519dcaca176a28a7710ac75c49f8 100644
Binary files a/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.assets.cache and b/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.assets.cache differ
diff --git a/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.csproj.FileListAbsolute.txt b/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.csproj.FileListAbsolute.txt
index 3ea90c95e3cbecdb0f45a4c1f005cac97ae02828..2f2c13f6063ebd5700ea2e9129014e9aba6b3216 100644
--- a/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.csproj.FileListAbsolute.txt
+++ b/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.csproj.FileListAbsolute.txt
@@ -11,3 +11,16 @@ E:\Kurssit\ties323\STMPServer\STMPServer\obj\Debug\netcoreapp3.1\STMPServer.cspr
 E:\Kurssit\ties323\STMPServer\STMPServer\obj\Debug\netcoreapp3.1\STMPServer.dll
 E:\Kurssit\ties323\STMPServer\STMPServer\obj\Debug\netcoreapp3.1\STMPServer.pdb
 E:\Kurssit\ties323\STMPServer\STMPServer\obj\Debug\netcoreapp3.1\STMPServer.genruntimeconfig.cache
+E:\Kurssit\ties323\SMTPServer\STMPServer\bin\Debug\netcoreapp3.1\STMPServer.exe
+E:\Kurssit\ties323\SMTPServer\STMPServer\bin\Debug\netcoreapp3.1\STMPServer.deps.json
+E:\Kurssit\ties323\SMTPServer\STMPServer\bin\Debug\netcoreapp3.1\STMPServer.runtimeconfig.json
+E:\Kurssit\ties323\SMTPServer\STMPServer\bin\Debug\netcoreapp3.1\STMPServer.runtimeconfig.dev.json
+E:\Kurssit\ties323\SMTPServer\STMPServer\bin\Debug\netcoreapp3.1\STMPServer.dll
+E:\Kurssit\ties323\SMTPServer\STMPServer\bin\Debug\netcoreapp3.1\STMPServer.pdb
+E:\Kurssit\ties323\SMTPServer\STMPServer\obj\Debug\netcoreapp3.1\STMPServer.csprojAssemblyReference.cache
+E:\Kurssit\ties323\SMTPServer\STMPServer\obj\Debug\netcoreapp3.1\STMPServer.AssemblyInfoInputs.cache
+E:\Kurssit\ties323\SMTPServer\STMPServer\obj\Debug\netcoreapp3.1\STMPServer.AssemblyInfo.cs
+E:\Kurssit\ties323\SMTPServer\STMPServer\obj\Debug\netcoreapp3.1\STMPServer.csproj.CoreCompileInputs.cache
+E:\Kurssit\ties323\SMTPServer\STMPServer\obj\Debug\netcoreapp3.1\STMPServer.dll
+E:\Kurssit\ties323\SMTPServer\STMPServer\obj\Debug\netcoreapp3.1\STMPServer.pdb
+E:\Kurssit\ties323\SMTPServer\STMPServer\obj\Debug\netcoreapp3.1\STMPServer.genruntimeconfig.cache
diff --git a/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.csprojAssemblyReference.cache b/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.csprojAssemblyReference.cache
index a0fbfd12797557adefa2aaaacd9d5126dec64303..e23245258eaf6b6145a13830bacb66ca8fd7c885 100644
Binary files a/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.csprojAssemblyReference.cache and b/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.csprojAssemblyReference.cache differ
diff --git a/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.dll b/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.dll
index 6ee31abf9275ece9404f513b7cab5fc4c513c936..e117101410faaa0c1bfcbf51b29842900d41aa31 100644
Binary files a/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.dll and b/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.dll differ
diff --git a/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.genruntimeconfig.cache b/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.genruntimeconfig.cache
index 548aa209cb89094092d00d40f63916a6c7d5ece6..f539eb6734924748325c8e4022f5738af2ca7c2f 100644
--- a/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.genruntimeconfig.cache
+++ b/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.genruntimeconfig.cache
@@ -1 +1 @@
-a2240db99a593c701e15ec395af3a989692b6803
+c66ac9dda9d1c69df8f67e727828843ec0743506
diff --git a/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.pdb b/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.pdb
index b55ef6297e060cea8925d05aaab2518797f8e85d..2b6ac083e5d73bfe9b47152c1407019e54503571 100644
Binary files a/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.pdb and b/SMTPServer/STMPServer/obj/Debug/netcoreapp3.1/STMPServer.pdb differ
diff --git a/SMTPServer/STMPServer/obj/STMPServer.csproj.nuget.dgspec.json b/SMTPServer/STMPServer/obj/STMPServer.csproj.nuget.dgspec.json
index 26c43ef2b70ca024d558a636f511a9a62103b093..601e163e85c6d25bcb2ba77e1b287840f6123884 100644
--- a/SMTPServer/STMPServer/obj/STMPServer.csproj.nuget.dgspec.json
+++ b/SMTPServer/STMPServer/obj/STMPServer.csproj.nuget.dgspec.json
@@ -1,17 +1,17 @@
 {
   "format": 1,
   "restore": {
-    "E:\\Kurssit\\ties323\\STMPServer\\STMPServer\\STMPServer.csproj": {}
+    "E:\\Kurssit\\ties323\\SMTPServer\\STMPServer\\STMPServer.csproj": {}
   },
   "projects": {
-    "E:\\Kurssit\\ties323\\STMPServer\\STMPServer\\STMPServer.csproj": {
+    "E:\\Kurssit\\ties323\\SMTPServer\\STMPServer\\STMPServer.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "E:\\Kurssit\\ties323\\STMPServer\\STMPServer\\STMPServer.csproj",
+        "projectUniqueName": "E:\\Kurssit\\ties323\\SMTPServer\\STMPServer\\STMPServer.csproj",
         "projectName": "STMPServer",
-        "projectPath": "E:\\Kurssit\\ties323\\STMPServer\\STMPServer\\STMPServer.csproj",
+        "projectPath": "E:\\Kurssit\\ties323\\SMTPServer\\STMPServer\\STMPServer.csproj",
         "packagesPath": "C:\\Users\\Joppe\\.nuget\\packages\\",
-        "outputPath": "E:\\Kurssit\\ties323\\STMPServer\\STMPServer\\obj\\",
+        "outputPath": "E:\\Kurssit\\ties323\\SMTPServer\\STMPServer\\obj\\",
         "projectStyle": "PackageReference",
         "configFilePaths": [
           "C:\\Users\\Joppe\\AppData\\Roaming\\NuGet\\NuGet.Config",
diff --git a/SMTPServer/STMPServer/obj/project.assets.json b/SMTPServer/STMPServer/obj/project.assets.json
index 4eee0bc91d4d38c454a8d7bda3db7bbc15fe7375..679ad6ccaa6f6966389476fc5bbd225540c9c173 100644
--- a/SMTPServer/STMPServer/obj/project.assets.json
+++ b/SMTPServer/STMPServer/obj/project.assets.json
@@ -13,11 +13,11 @@
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "E:\\Kurssit\\ties323\\STMPServer\\STMPServer\\STMPServer.csproj",
+      "projectUniqueName": "E:\\Kurssit\\ties323\\SMTPServer\\STMPServer\\STMPServer.csproj",
       "projectName": "STMPServer",
-      "projectPath": "E:\\Kurssit\\ties323\\STMPServer\\STMPServer\\STMPServer.csproj",
+      "projectPath": "E:\\Kurssit\\ties323\\SMTPServer\\STMPServer\\STMPServer.csproj",
       "packagesPath": "C:\\Users\\Joppe\\.nuget\\packages\\",
-      "outputPath": "E:\\Kurssit\\ties323\\STMPServer\\STMPServer\\obj\\",
+      "outputPath": "E:\\Kurssit\\ties323\\SMTPServer\\STMPServer\\obj\\",
       "projectStyle": "PackageReference",
       "configFilePaths": [
         "C:\\Users\\Joppe\\AppData\\Roaming\\NuGet\\NuGet.Config",
diff --git a/SMTPServer/STMPServer/obj/project.nuget.cache b/SMTPServer/STMPServer/obj/project.nuget.cache
index ea3d30df30af16941bebb7d56ce8be97d4754096..c7ff611fcd4f9caaaa3de485f0fbb341e31ddcbe 100644
--- a/SMTPServer/STMPServer/obj/project.nuget.cache
+++ b/SMTPServer/STMPServer/obj/project.nuget.cache
@@ -1,8 +1,8 @@
 {
   "version": 2,
-  "dgSpecHash": "CIwU8q2TPMKQxAYhWQ+V8ZxoPRBfqJ9xbsl5ohVXOAzomzR3eZ9pl8oTgpwuhLg6jNAyuSIgtC72KV96F1kg9Q==",
+  "dgSpecHash": "GUgODfaZqeXeywBng/PbfvBiJGNAgAkP7qByNo74xVnN5IstPEl1NzfN7QxrIAoQ/0VU8i+1dhA5NM89KsqNfA==",
   "success": true,
-  "projectFilePath": "E:\\Kurssit\\ties323\\STMPServer\\STMPServer\\STMPServer.csproj",
+  "projectFilePath": "E:\\Kurssit\\ties323\\SMTPServer\\STMPServer\\STMPServer.csproj",
   "expectedPackageFiles": [],
   "logs": []
 }
\ No newline at end of file