diff --git a/glebby-server/glebby.py b/glebby-server/glebby.py
index f4f7adc..74a1329 100644
--- a/glebby-server/glebby.py
+++ b/glebby-server/glebby.py
@@ -117,6 +117,8 @@ class GlebbyState:
             self.next_client_id += 1
             return client_id
 
+    # TODO: Instead of using clients_lock, synchronize clients throught incoming_messages
+    # Make add_client and remove_client simply push events into the queue
     def add_client(self, sock):
         client_id = self._get_next_client_id()
         self.broadcast(client_id, {'type': 'join'})