diff --git a/TODO b/TODO
index a4c287c8..c059b00d 100644
--- a/TODO
+++ b/TODO
@@ -94,3 +94,12 @@ 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
+	- Remove callbacks (may need "driver" for queues)
+	- Reorganize gui code into distinct layers
+	  - Possibly merge back with lib/?
+	- Remove glib specifc code from core/
+	- Ports:
+		- OSX
+		- Windows
+		- Android
+	- Command line tools for web interface development?