diff --git a/TDDD49-P2P/.vs/TDDD49-P2P/v15/.suo b/TDDD49-P2P/.vs/TDDD49-P2P/v15/.suo
index dfcd06eb8a797218107b22dbe33b1f7dafd4b95b..38ba4a8aaa850d2eebb301e318f4b75e3fea938f 100644
Binary files a/TDDD49-P2P/.vs/TDDD49-P2P/v15/.suo and b/TDDD49-P2P/.vs/TDDD49-P2P/v15/.suo differ
diff --git a/TDDD49-P2P/.vs/TDDD49-P2P/v15/Server/sqlite3/storage.ide-shm b/TDDD49-P2P/.vs/TDDD49-P2P/v15/Server/sqlite3/storage.ide-shm
index 3195268b9f0356020a520e9e370d6850efd5f924..9ad5985402b9c397da9d128e09d7d61fe62d813e 100644
Binary files a/TDDD49-P2P/.vs/TDDD49-P2P/v15/Server/sqlite3/storage.ide-shm and b/TDDD49-P2P/.vs/TDDD49-P2P/v15/Server/sqlite3/storage.ide-shm differ
diff --git a/TDDD49-P2P/.vs/TDDD49-P2P/v15/Server/sqlite3/storage.ide-wal b/TDDD49-P2P/.vs/TDDD49-P2P/v15/Server/sqlite3/storage.ide-wal
index 2c35c1d01eef511390e717299b0bc4f77dc47119..facd590ddb0caf86aeede3cc31e060d483e5b8b4 100644
Binary files a/TDDD49-P2P/.vs/TDDD49-P2P/v15/Server/sqlite3/storage.ide-wal and b/TDDD49-P2P/.vs/TDDD49-P2P/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/TDDD49-P2P/Models/Connection.cs b/TDDD49-P2P/Models/Connection.cs
index 4fa8e7c6b2b5daf8a42557b1bb49452ceb836d0f..de37b6dace54f530fa152f2e15400d04a990736d 100644
--- a/TDDD49-P2P/Models/Connection.cs
+++ b/TDDD49-P2P/Models/Connection.cs
@@ -143,10 +143,8 @@ namespace TDDD49_P2P.Models
                 // Enter the listening loop.
                 while (true)
                 {
-                    Console.WriteLine("Waiting for a connection... ");
+                    //Console.WriteLine("Waiting for a connection... ");
                     Client = Server.AcceptTcpClient();
-                    Console.Write("CLIENT: ");
-                    Console.WriteLine(Client);
 
                     // Get a stream object for reading and writing
                     ServerStream = Client.GetStream();
@@ -157,7 +155,6 @@ namespace TDDD49_P2P.Models
                     {
                         break;
                     }
-                    Console.WriteLine("Connected!");
                     Message message = new Message() { Msg = "CONNECTED", Username = name, Type = "SYS" };
                     SendToStream(JsonConvert.SerializeObject(message));
 
@@ -170,14 +167,13 @@ namespace TDDD49_P2P.Models
                         {
                             string s = System.Text.Encoding.ASCII.GetString(bytes, 0, i);
                             RecData = JsonConvert.DeserializeObject<Message>(s);
-                            Console.WriteLine("Received server: {0}", RecData.Msg);
+                            //Console.WriteLine("Received server: {0}", RecData.Msg);
 
                             if (RecData.Msg == "STOP" && RecData.Type == "SYS")
                             {
                                 CanOnlyRead = false;
                                 if (Server != null)
                                 {
-                                    Console.WriteLine("server is closing server");
                                     Client.Close();
                                     Client = null;
                                     Server.Stop();
@@ -185,7 +181,6 @@ namespace TDDD49_P2P.Models
                                 }
                                 else
                                 {
-                                    Console.WriteLine("server is closing client");
                                     Client.Close();
                                     Server.Stop();
                                     Client = null;
@@ -236,14 +231,13 @@ namespace TDDD49_P2P.Models
                 {
                     // Translate data bytes to a ASCII string.
                     RecData = JsonConvert.DeserializeObject<Message>(System.Text.Encoding.ASCII.GetString(bytes, 0, i));
-                    Console.WriteLine("Received client: {0}", RecData.Msg);
+                    //Console.WriteLine("Received client: {0}", RecData.Msg);
 
                     if (RecData.Msg == "STOP" && RecData.Type == "SYS")
                     {
                         CanOnlyRead = false;
                     } else if (RecData.Msg == "CONNECTED" && RecData.Type == "SYS")
                     {
-                        Console.WriteLine("Connected!");
                         Chatter = RecData.Username;
                         Message message = new Message() { Msg = "CONNECTED", Username = name, Type = "SYS" };
                         SendToStream(JsonConvert.SerializeObject(message));
@@ -318,7 +312,6 @@ namespace TDDD49_P2P.Models
                 CanOnlyRead = false;
                 if (Server != null)
                 {
-                    Console.WriteLine("Stoping server");
                     Client.Close();
                     Server.Stop();
                     Client = null;
@@ -326,7 +319,6 @@ namespace TDDD49_P2P.Models
                 }
                 else
                 {
-                    Console.WriteLine("Stopping client");
                     Client.Close();
                     Client = null;
                     clientThread.Abort();
@@ -366,7 +358,7 @@ namespace TDDD49_P2P.Models
             Byte[] data = System.Text.Encoding.ASCII.GetBytes(message);
             // Send the message to the connected TcpServer.           
             ServerStream.Write(data, 0, data.Length);
-            Console.WriteLine("Sent: {0}", message);
+            //Console.WriteLine("Sent: {0}", message);
         }
 
 
diff --git a/TDDD49-P2P/ViewModels/ChatViewModel.cs b/TDDD49-P2P/ViewModels/ChatViewModel.cs
index 40c5ea586e4ce56adf81b1c548173cab06d7658c..e4307f8ccc11226b67dfc35e0c149faca200bc57 100644
--- a/TDDD49-P2P/ViewModels/ChatViewModel.cs
+++ b/TDDD49-P2P/ViewModels/ChatViewModel.cs
@@ -330,7 +330,6 @@ namespace TDDD49_P2P.ViewModels
                                 Message msg = new Message() { Msg = "REJECT", Username = User.Name, Type = "SYS" };
                                 Connection.SendToStream(JsonConvert.SerializeObject(msg));
                             }
-                            Console.WriteLine(Connection.Result);
                             stop = true;
                         }
                         if (stop)
diff --git a/TDDD49-P2P/obj/Debug/TDDD49-P2P.csprojAssemblyReference.cache b/TDDD49-P2P/obj/Debug/TDDD49-P2P.csprojAssemblyReference.cache
index 98457dffb91a5fe74f59b9cf9b7eea25033eb376..d21480bdb7439d55324335ea89b96e937bbbb37c 100644
Binary files a/TDDD49-P2P/obj/Debug/TDDD49-P2P.csprojAssemblyReference.cache and b/TDDD49-P2P/obj/Debug/TDDD49-P2P.csprojAssemblyReference.cache differ
diff --git a/TDDD49-P2P/obj/Debug/TDDD49-P2P_MarkupCompile.i.cache b/TDDD49-P2P/obj/Debug/TDDD49-P2P_MarkupCompile.i.cache
index 460bf39608b464b01d13887331676f26babad515..982bea57e5427df3c13a7ff5bc9d446867557c56 100644
--- a/TDDD49-P2P/obj/Debug/TDDD49-P2P_MarkupCompile.i.cache
+++ b/TDDD49-P2P/obj/Debug/TDDD49-P2P_MarkupCompile.i.cache
@@ -12,7 +12,7 @@ DEBUG;TRACE
 X:\tddd49\TDDD49-P2P\App.xaml
 11892971807
 
-15329401250
+15-995611915
 15-996201704
 Views\MainWindow.xaml;