diff --git a/turbo_hipster/worker_manager.py b/turbo_hipster/worker_manager.py
index 8c8150f..bcd601c 100644
--- a/turbo_hipster/worker_manager.py
+++ b/turbo_hipster/worker_manager.py
@@ -112,12 +112,13 @@ class ZuulClient(threading.Thread):
             self.global_config['zuul_server']['gearman_host'],
             self.global_config['zuul_server']['gearman_port']
         )
-        self.register_functions()
+        self.gearman_worker.waitForServer()
 
     def register_functions(self):
         self.log.debug("Register functions with gearman")
         for function_name, plugin in self.functions.items():
             self.gearman_worker.registerFunction(function_name)
+        self.log.debug(self.gearman_worker.functions)
 
     def add_function(self, function_name, plugin):
         self.log.debug("Add function, %s, to list" % function_name)
diff --git a/turbo_hipster/worker_server.py b/turbo_hipster/worker_server.py
index 5cca261..a87c7bc 100755
--- a/turbo_hipster/worker_server.py
+++ b/turbo_hipster/worker_server.py
@@ -48,6 +48,9 @@ class Server(object):
         self.zuul_manager = None
         self.zuul_client = None
         self.plugins = []
+
+        # TODO: Make me unique (random?) and we should be able to run multiple
+        # instances of turbo-hipster on the one host
         self.worker_name = os.uname()[1]
 
         self.tasks = {}