diff --git a/notebook/services/kernels/handlers.py b/notebook/services/kernels/handlers.py
index d421077038..70ad5e7e2c 100644
--- a/notebook/services/kernels/handlers.py
+++ b/notebook/services/kernels/handlers.py
@@ -93,6 +93,9 @@ def post(self, kernel_id, action):
 
 
 class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
+    '''There is one ZMQChannelsHandler per running kernel and it oversees all
+    the sessions.
+    '''
     
     # class-level registry of open sessions
     # allows checking for conflict on session-id,
@@ -198,6 +201,10 @@ def initialize(self):
         self._kernel_info_future = Future()
         self._close_future = Future()
         self.session_key = ''
+        
+        # TODO: the buffer should likely be a memory bounded queue, we're starting with a list to keep it simple
+        # TODO: Min suggested this should exist on the `Kernel` as well, not in this ZMQChannelsHandler
+        self.message_buffer = []
 
         # Rate limiting code
         self._iopub_window_msg_count = 0
@@ -257,6 +264,7 @@ def open(self, kernel_id):
         super(ZMQChannelsHandler, self).open()
         self.kernel_manager.notify_connect(kernel_id)
         try:
+            # TODO: if this is a reconnection, we'll replay messages
             self.create_stream()
         except web.HTTPError as e:
             self.log.error("Error opening stream: %s", e)
@@ -404,6 +412,8 @@ def close(self):
         return self._close_future
 
     def on_close(self):
+        # TODO: Start buffering messages
+        
         self.log.debug("Websocket closed %s", self.session_key)
         # unregister myself as an open session (only if it's really me)
         if self._open_sessions.get(self.session_key) is self: