diff --git a/ErgometerServer/ClientThread.cs b/ErgometerServer/ClientThread.cs
index 5e86fa0..db80bc7 100644
--- a/ErgometerServer/ClientThread.cs
+++ b/ErgometerServer/ClientThread.cs
@@ -63,10 +63,12 @@ namespace ErgometerServer
                         {
                             name = input.DisplayName;
                             loggedin = true;
+                            FileHandler.CreateSession(session, name);
                         }
                         break;
                     case NetCommand.CommandType.DATA:
                         metingen.Add(input.Meting);
+                        FileHandler.WriteMetingen(session, metingen);
                         break;
                     case NetCommand.CommandType.CHAT:
                         chat.Add(new ChatMessage(name, input.ChatMessage));
@@ -74,6 +76,8 @@ namespace ErgometerServer
                     case NetCommand.CommandType.LOGOUT:
                         loggedin = false;
                         running = false;
+                        FileHandler.WriteMetingen(session, metingen);
+                        FileHandler.WriteChat(session, chat);
                         client.Close();
                         break;
                     default:
diff --git a/ErgometerServer/ErgometerServer.csproj b/ErgometerServer/ErgometerServer.csproj
index a5e6037..c1a39b9 100644
--- a/ErgometerServer/ErgometerServer.csproj
+++ b/ErgometerServer/ErgometerServer.csproj
@@ -33,9 +33,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ErgometerLibrary, Version=1.0.2.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\ErgometerLibrary\ErgometerLibrary\ErgometerLibrary\bin\Debug\ErgometerLibrary.dll</HintPath>
+    <Reference Include="ErgometerLibrary">
+      <HintPath>..\..\ErgometerLibrary\ErgometerLibrary\bin\Debug\ErgometerLibrary.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/ErgometerServer/Server.cs b/ErgometerServer/Server.cs
index a73c594..25a87a0 100644
--- a/ErgometerServer/Server.cs
+++ b/ErgometerServer/Server.cs
@@ -24,6 +24,8 @@ namespace ErgometerServer
         {
             FileHandler.CheckDataFolder();
 
+            Console.WriteLine("Checking datafolder " + FileHandler.DataFolder);
+
             clients = new List<ClientThread>();
 
             TcpListener listener = new TcpListener(NetHelper.GetIP("127.0.0.1"), 8888);