diff --git a/PolyChat/Controller.cs b/PolyChat/Controller.cs
index 61793fb..e390a9e 100644
--- a/PolyChat/Controller.cs
+++ b/PolyChat/Controller.cs
@@ -164,6 +164,8 @@ namespace PolyChat
         /// <param name="ip"></param>
         public void loadChats()
         {
+            
+
             //load dir and create if non existant
             if (Directory.Exists("U:\\PolyChat\\Saves"))
             {
@@ -188,6 +190,7 @@ namespace PolyChat
                     ip = ip.Substring(0, ip.Length - 4);
                     Debug.WriteLine("-" + ip + "-");
                     Debug.WriteLine(jsonArr);
+                    Connect(ip);
                     UIController.OnIncomingMessages(ip, jsonArr);
                 }
             }
diff --git a/PolyChat/MainPage.xaml.cs b/PolyChat/MainPage.xaml.cs
index 7cc022e..245e679 100644
--- a/PolyChat/MainPage.xaml.cs
+++ b/PolyChat/MainPage.xaml.cs
@@ -156,8 +156,13 @@ namespace PolyChat
                         new ChatMessage(
                             origin,
                             item["type"].ToString(),
+<<<<<<< Updated upstream
                             item["content"].ToString()//,
                                                       //DateTime.Parse(item["timestamp"].ToString())
+=======
+                            item["content"].ToString(),
+                            DateTime.Parse(item["timestamp"].ToString())
+>>>>>>> Stashed changes
                         )
                     );
                 }
diff --git a/PolyChat/Models/ChatMessage.cs b/PolyChat/Models/ChatMessage.cs
index 5757702..55c593a 100644
--- a/PolyChat/Models/ChatMessage.cs
+++ b/PolyChat/Models/ChatMessage.cs
@@ -12,6 +12,11 @@ namespace PolyChat.Models
         public DateTime TimeStamp;
         public readonly bool Foreign;
         
+
+        public ChatMessage()
+        {
+
+        }
         /// <summary>
         /// Create own Message (directly sent)
         /// </summary>
@@ -43,7 +48,7 @@ namespace PolyChat.Models
             Type = type;
             Content = content;
             Foreign = foreign;
-            Debug.WriteLine("Created Loaded Message: " + ToString());
+            Debug.WriteLine("Created Loaded Message: " + ToString());            
         }
 
         override