diff --git a/TODO b/TODO
index c059b00d..f7f0a230 100644
--- a/TODO
+++ b/TODO
@@ -94,10 +94,13 @@ Future work:
 	- "On demand" databases that load the first time they are accessed?
 	- Split filtering code into index for searching and text formatting
 	  - Text formatting includes lowercase, length strings, and date strings
+	  - Queues have their own indexes?
 	- Remove callbacks (may need "driver" for queues)
 	- Reorganize gui code into distinct layers
 	  - Possibly merge back with lib/?
 	- Remove glib specifc code from core/
+	- Virtual file system
+	  - Fake filesystem access for testing
 	- Ports:
 		- OSX
 		- Windows