diff --git a/src/Parser.cs b/src/Parser.cs
index 4603269..3043183 100644
--- a/src/Parser.cs
+++ b/src/Parser.cs
@@ -4,6 +4,18 @@ namespace WorldOfPeacecraft
 {
 	public class Parser
 	{
+        private string fromServer;
+		private string toServer;
+
+        public void convertIncoming(string fromServer)
+        {
+
+		}
+
+		public void convertOutgoing(string toServer)
+        {
+
+		}
 				
         public void setMe()
         {
@@ -90,24 +102,6 @@ namespace WorldOfPeacecraft
         {
            
         }
-		
-=======
-		private string fromServer;
-		private string toServer;
-
-		public Parser ()
-		{
-			//TODO: Code.
-		}
-
-		public void convertIncoming(string fromServer){
-
-		}
-
-		public void convertOutgoing(string toServer){
-
-		}
-
 	}
 }