diff --git a/TODO b/TODO
index fccf9e95..fbe26413 100644
--- a/TODO
+++ b/TODO
@@ -355,6 +355,15 @@ Wireless daemon
   Complexity: C1
   Owner: Denis Kenzior <denkenz@gmail.com>
 
+- Coalesce BSS and security parameters into Network object
+
+  Coalesce all the BSS with the same SSID and security parameters into one
+  Network object in wiphy.c
+
+  Priority: High
+  Complexity: C2
+  Owner: Jukka Rissanen <jukka.rissanen@linux.intel.com>
+
 
 Client
 ======