diff --git a/source/tristanable/exceptions.d b/source/tristanable/exceptions.d
index 0e7926c..399bb1a 100644
--- a/source/tristanable/exceptions.d
+++ b/source/tristanable/exceptions.d
@@ -1,15 +1,26 @@
 module tristanable.exceptions;
 
-public enum Error
+public enum ErrorType
 {
-    QueueExists
+    QueueExists,
+    QUEUE_NOT_FOUND,
+    QUEUE_ALREADY_EXISTS
 }
 
 public class TristanableException : Exception
 {
-    this(Error err)
+    private ErrorType err;
+    
+    this(ErrorType err)
     {
         // TODO: Do this
         super("TODO: Do this");
+
+        this.err = err;
+    }
+
+    public ErrorType getError()
+    {
+        return err;
     }
 }
\ No newline at end of file
diff --git a/source/tristanable/manager/watcher.d b/source/tristanable/manager/watcher.d
index ef28e49..67272d4 100644
--- a/source/tristanable/manager/watcher.d
+++ b/source/tristanable/manager/watcher.d
@@ -44,8 +44,6 @@ public class Watcher : Thread
     {
         while(true)
         {
-            // TODO: Implement me
-
             /* Do a bformat read-and-decode */
             byte[] wireTristan;
             receiveMessage(socket, wireTristan);
@@ -53,7 +51,7 @@ public class Watcher : Thread
             /* Decode the received bytes into a tagged message */
             TaggedMessage decodedMessage = TaggedMessage.decode(wireTristan);
 
-            
+            // TODO: Implement me
         }
     }
 }
\ No newline at end of file