diff --git a/TODO b/TODO
index 12111896..70831ac6 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,5 @@
 Goals for future releases of Openbox (THIS CAN AND WILL CHANGE):
 2.0:
-* Add XEventHandler class to make event handling better than ever!
-
 * using std::string instead of char *'s. bool instead of Bool. proper consting
   everywhere where appropriate. unsigned ints where appropriate. etc.
 
@@ -10,6 +8,8 @@ Goals for future releases of Openbox (THIS CAN AND WILL CHANGE):
 * separate Font class with support for Xfonts, xfontsets, and xft.
 
 3.0:
+* Add XEventHandler class to make event handling better than ever!
+
 * reorganization of class model. Add XWidget class (contains an X drawable).
 
 * key/mouse/action bindings