diff --git a/source/tristanable/manager.d b/source/tristanable/manager.d
index 65e2b9d..2fa8b70 100644
--- a/source/tristanable/manager.d
+++ b/source/tristanable/manager.d
@@ -4,6 +4,7 @@ import std.socket : Socket;
 import core.sync.mutex : Mutex;
 import bmessage : bSendMessage = sendMessage;
 import tristanable.queue : Queue;
+import tristanable.watcher;
 
 public final class Manager
 {
@@ -19,6 +20,8 @@ public final class Manager
     private Socket socket;
 
 
+	private Watcher watcher;
+
 
 	/**
 	* Constructs a new Manager with the given
@@ -34,6 +37,8 @@ public final class Manager
 		queuesLock = new Mutex();
 
 		/* Initialize the watcher */
+		watcher = new Watcher(this, socket);
+
 	}
 
 	public Queue getQueue(ulong tag)