diff --git a/ugly_hacks/santiago/TODO b/ugly_hacks/santiago/TODO
new file mode 100644
index 000000000..7c660d65c
--- /dev/null
+++ b/ugly_hacks/santiago/TODO
@@ -0,0 +1,24 @@
+* Service time expiry
+
+- Replies include "this service expires on".
+
+* Search hop expiry.
+
+- Searches are bounced only for a maximum number of cilents
+   (Gnutella-style).
+
+* Add real Unit Testing.
+
+- Spec out the system through test harnesses.  If the tests can run
+   the system, it's complete.
+
+* Message Queuing
+
+- Process a maximum of X MB over Y requests per unit time Z per
+   friend.
+
+- Messages that exceed that maximum are queued for the next time unit.
+
+* Process Separation
+
+- Listeners aren't senders aren't controllers.