diff --git a/src/uvw/stream.hpp b/src/uvw/stream.hpp
index 20947f73..61101ca7 100644
--- a/src/uvw/stream.hpp
+++ b/src/uvw/stream.hpp
@@ -37,6 +37,7 @@ class Stream: public Handle<T> {
     }
 
     static void writeCallback(uv_write_t *req, int status) {
+        // TODO migrate to Request (see request.hpp for further details)
         T &ref = *(static_cast<T*>(req->handle->data));
         if(status) { ref.publish(ErrorEvent{status}); }
         else { ref.publish(WriteEvent{}); }
@@ -85,6 +86,7 @@ public:
 
     void write(char *data, ssize_t length) {
         uv_buf_t bufs[] = { uv_buf_init(data, length) };
+        // TODO migrate to Request (see request.hpp for further details)
         uv_write_t *req = new uv_write_t;
 
         auto err = uv_write(req, this->template get<uv_stream_t>(), bufs, 1, &Stream<T>::writeCallback);