diff --git a/TODO b/TODO
deleted file mode 100644
index d73d2413..00000000
--- a/TODO
+++ /dev/null
@@ -1,41 +0,0 @@
-To whom it may concern, this is -*- outline -*- mode.
-
-* The library - libfko:
-** C-based test suite.
-** Get it out there and get feedback.
-
-* The fwknop C client:
-** Config file support (~/.fwknoprc ?).
-** Server Auth support (maybe). 
-
-* The fwknopd server:
-** Sniffer support to acquire SPA packet data ala the fwknopd Perl server:
-** SPA packet decryption:
-*** Add support for ipfw and pf support eventually.
-** Test on embedded platforms - especially OpenWRT on a Linksys router.
-
-* Nice to haves:
-** Binary packages:
-*** Redhat RPMS
-*** Debian .deb
-** Linux/Unix platform:
-*** A GNOME or KDE GUI app for the client.
-** Windows platform:
-*** VB and/or C# class wrappers around libfko.dll.
-*** A Windows GUI app that uses the dll or wrapper classes.
-** Misc:
-*** Python module wrapping libfko.
-*** Ruby module wrapping libfko.
-*** PHP module wrapping libfko.
-
-
-Copyright 2009-2010 - Damien Stuart
-
-This file is free software; as a special exception the author gives
-unlimited permission to copy and/or distribute it, with or without
-modifications, as long as this notice is preserved.
-
-This file is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
diff --git a/todo.org b/todo.org
index f619582c..ee4d6ad3 100644
--- a/todo.org
+++ b/todo.org
@@ -50,3 +50,13 @@
 ** [test suite] backwards compatibility tests
    The test suite should have the ability to test backwards compatibility
    between fwknop versions.
+** For Linux/Unix - a GNOME or KDE GUI app for the fwknop client.
+   Although there is currently a functioning web proxy that can serve as a
+   UI via a browser, it would be nice to have native GNOME and KDE GUI
+   wrappers for the fwknop client.
+** For Windows - VB and/or C# class wrappers around libfko.dll
+   Extend Windows support with VB and/or C# class wrappers around the
+   libfko.dll
+** Ruby bindings to libfko
+   Perl and Python bindings already exist for libfko, so add Ruby to this list
+   as well.