diff --git a/doc/TODO b/doc/TODO
index 851e8e5..1ffd3fe 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -5,14 +5,32 @@ general/other:
 	1:raii swscontext
 
 matrix:
-	7:server level queries in matrix::session
-	3:presence
-	3:get other user presence
-	2:kick users
-	2:ban/unban users
-	1:send custom html messages
-	1:change password
-	1:ability to select specification revision
+	session:
+		7:server level queries in matrix::session
+		2:capability query
+		2:revision query
+		1:ability to select specification revision
+		1:change password
+		1:register account
+		1:device management
+	client:
+		3:get other user presence
+		3:set presence
+		2:query other users' data
+		1:download media
+		1:query/set custom user data
+		1:query/addto public room directory
+		1:deactivate account
+		1:user search
+	room:
+		2:kick users
+		2:ban/unban users
+		2:forget room
+		1:send custom html messages
+		1:set new room alias
+		2:delete room alias
+		1:query/set custom user data per room basis
+		1:query/set/delete room tags
 
 frontend:
 	10: handle recieved message events