diff --git a/TODO.md b/TODO.md
index 7081287ef7eb085e219e788794b492f2e477fd5f..ebdc47ce2dd2daadaec4d6212fe253ea12867155 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1 +1,5 @@
+* Allow multiple entries (phone numbers) per Jabber ID
+* Generalize look up method and allow email addresses (and potentially all sort of uris) to be stored in the directory
+* XEPify look up method
 * Give verified users access to query the directory (Probably configurable via config flag)
+* send IQ ping when 'already on another device' error occurs