diff --git a/MailServer/MailServer.csproj b/MailServer/MailServer.csproj
index 772b5ac..40693c7 100644
--- a/MailServer/MailServer.csproj
+++ b/MailServer/MailServer.csproj
@@ -223,16 +223,19 @@
     </Compile>
     <Compile Include="Misc\SSLMode.cs" />
     <Compile Include="Misc\StreamLineReader\StreamLineReader.cs" />
+    <Compile Include="Services\IMAP\Server\IMAP_Service.Events.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Types\StringReader\StringReader.cs" />
     <Compile Include="Misc\TextUtils\TextUtils.cs" />
     <Compile Include="Misc\TimerEx\TimerEx.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Service1.cs">
+    <Compile Include="Services\IMAP\Server\IMAP_Service.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Service1.Designer.cs">
-      <DependentUpon>Service1.cs</DependentUpon>
+    <Compile Include="Services\IMAP\Server\IMAP_Service.Designer.cs">
+      <DependentUpon>IMAP_Service.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/MailServer/MailServer.csproj.user b/MailServer/MailServer.csproj.user
index 566c009..fa0135d 100644
--- a/MailServer/MailServer.csproj.user
+++ b/MailServer/MailServer.csproj.user
@@ -3,4 +3,7 @@
   <PropertyGroup>
     <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <StartArguments>-r</StartArguments>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/MailServer/Program.cs b/MailServer/Program.cs
index eae9705..54943c1 100644
--- a/MailServer/Program.cs
+++ b/MailServer/Program.cs
@@ -10,27 +10,30 @@ namespace MailServer
 {
     static class Program
     {
-        /*static void auth_user_arsch(object sender, IMAP.Server.AuthUser_EventArgs e)
-        {
-            e.Validated = false;
-            if(e.UserName == "blubb" && e.PasswData == "asd")
-                e.Validated = true;
-        }*/
         /// <summary>
         /// Der Haupteinstiegspunkt für die Anwendung.
         /// </summary>
-        static void Main()
+        static void Main(string[] args)
         {
-            ServiceBase[] ServicesToRun;
-            ServicesToRun = new ServiceBase[] 
-			{ 
-				new IMAP_Service() 
-			};
-            ServiceBase.Run(ServicesToRun);
-            /*
-            IMAP.Server.Server asd = new IMAP.Server.Server();
-            asd.AuthUser += new IMAP.Server.Server.AuthUserEventHandler(auth_user_arsch);
-            asd.GetMessage += new IMAP.Server.Server.MessageEventHandler(asd_GetMessage);*/
+            if (args.Length == 0)
+            {
+                ServiceBase[] ServicesToRun;
+                ServicesToRun = new ServiceBase[] 
+                { 
+				    new IMAP_Service() 
+			    };
+                ServiceBase.Run(ServicesToRun);
+            }
+            else if (args.Length == 1 || args[0] == "-r")
+            {
+                IMAP_Service imap_s = new IMAP_Service();
+                imap_s.Start(args);
+                while (true)
+                {
+                    System.Threading.Thread.Sleep(100);
+                }
+            }
+
         }
     }
 }
diff --git a/MailServer/Services/IMAP/Server/IMAP_Service.Events.cs b/MailServer/Services/IMAP/Server/IMAP_Service.Events.cs
index fab780c..1c08462 100644
--- a/MailServer/Services/IMAP/Server/IMAP_Service.Events.cs
+++ b/MailServer/Services/IMAP/Server/IMAP_Service.Events.cs
@@ -17,48 +17,92 @@ namespace MailServer.Services
                 e.Validated = true;
         }
 
-        void server_CopyMessage(object sender, Message_EventArgs e);
+        void server_CopyMessage(object sender, Message_EventArgs e)
+        {
+        }
 
-        void server_CreateFolder(object sender, Mailbox_EventArgs e);
+        void server_CreateFolder(object sender, Mailbox_EventArgs e)
+        {
+        }
 
-        void server_DeleteFolder(object sender, Mailbox_EventArgs e);
+        void server_DeleteFolder(object sender, Mailbox_EventArgs e)
+        {
+        }
 
-        void server_DeleteFolderACL(object sender, IMAP_DELETEACL_eArgs e);
+        void server_DeleteFolderACL(object sender, IMAP_DELETEACL_eArgs e)
+        {
+        }
 
-        void server_DeleteMessage(object sender, Message_EventArgs e);
+        void server_DeleteMessage(object sender, Message_EventArgs e)
+        {
+        }
 
-        void server_GetFolderACL(object sender, IMAP_GETACL_eArgs e);
+        void server_GetFolderACL(object sender, IMAP_GETACL_eArgs e)
+        {
+        }
 
-        void server_GetFolders(object sender, IMAP_Folders e);
+        void server_GetFolders(object sender, IMAP_Folders e)
+        {
+        }
 
-        void server_GetMessageItems(object sender, IMAP_eArgs_MessageItems e);
+        void server_GetMessageItems(object sender, IMAP_eArgs_MessageItems e)
+        {
+        }
 
-        void server_GetMessagesInfo(object sender, IMAP_eArgs_GetMessagesInfo e);
+        void server_GetMessagesInfo(object sender, IMAP_eArgs_GetMessagesInfo e)
+        {
+        }
 
-        void server_GetSharedRootFolders(object sender, SharedRootFolders_EventArgs e);
+        void server_GetSharedRootFolders(object sender, SharedRootFolders_EventArgs e)
+        {
+        }
 
-        void server_GetSubscribedFolders(object sender, IMAP_Folders e);
+        void server_GetSubscribedFolders(object sender, IMAP_Folders e)
+        {
+        }
 
-        void server_GetUserACL(object sender, IMAP_GetUserACL_eArgs e);
+        void server_GetUserACL(object sender, IMAP_GetUserACL_eArgs e)
+        {
+        }
 
-        void server_GetUserQuota(object sender, IMAP_eArgs_GetQuota e);
+        void server_GetUserQuota(object sender, IMAP_eArgs_GetQuota e)
+        {
+        }
 
-        void server_RenameFolder(object sender, Mailbox_EventArgs e);
+        void server_RenameFolder(object sender, Mailbox_EventArgs e)
+        {
+        }
 
-        void server_SessionLog(object sender, Log_EventArgs e);
+        void server_SessionLog(object sender, Log_EventArgs e)
+        {
+        }
 
-        void server_SetFolderACL(object sender, IMAP_SETACL_eArgs e);
+        void server_SetFolderACL(object sender, IMAP_SETACL_eArgs e)
+        {
+        }
 
-        void server_StoreMessage(object sender, Message_EventArgs e);
+        void server_StoreMessage(object sender, Message_EventArgs e)
+        {
+        }
 
-        void server_StoreMessageFlags(object sender, Message_EventArgs e);
+        void server_StoreMessageFlags(object sender, Message_EventArgs e)
+        {
+        }
 
-        void server_SubscribeFolder(object sender, Mailbox_EventArgs e);
+        void server_SubscribeFolder(object sender, Mailbox_EventArgs e)
+        {
+        }
 
-        void server_SysError(object sender, Error_EventArgs e);
+        void server_SysError(object sender, Error_EventArgs e)
+        {
+        }
 
-        void server_UnSubscribeFolder(object sender, Mailbox_EventArgs e);
+        void server_UnSubscribeFolder(object sender, Mailbox_EventArgs e)
+        {
+        }
 
-        void server_ValidateIPAddress(object sender, ValidateIP_EventArgs e);
+        void server_ValidateIPAddress(object sender, ValidateIP_EventArgs e)
+        {
+        }
     }
 }
diff --git a/MailServer/Services/IMAP/Server/IMAP_Service.cs b/MailServer/Services/IMAP/Server/IMAP_Service.cs
index 43189ce..f180514 100644
--- a/MailServer/Services/IMAP/Server/IMAP_Service.cs
+++ b/MailServer/Services/IMAP/Server/IMAP_Service.cs
@@ -57,5 +57,9 @@ namespace MailServer.Services
         {
             this.server.StopServer();
         }
+        public void Start(string[] args)
+        {
+            OnStart(args);
+        }
     }
 }