diff --git a/TODO b/TODO
index 5c314df..9f6655e 100644
--- a/TODO
+++ b/TODO
@@ -51,38 +51,27 @@ BlueZ 5
 Priority/Complexity omitted as all items are required before 5.0 is
 released.
 
-- Remove telephony driver framework and replace with a org.bluez.Profile
-  based solution.
-
-- Expose per-profile connection states on the Device interface
-  (presumably a list of UUIDs for each connected profile)
-
-- [done] Move base path to /org/bluez
-
-- [done] Remove GStreamer and libsbc code
-
-- Don't install libbluetooth by default (put it behind a configure switch)
-
 - Merge obexd.git into bluez.git
 
-- Change DiscoverServices to return a list of service object paths
+- Convert obexd to use org.bluez.Profile
+
+- Convert obexd & obex-client to ObjectManager/Properties
 
 - Remove org.bluez.Service interface (it has become unnecessary thanks
   to org.bluez.Profile). obexd needs to be converted to use the new
   interface first.
 
+- Don't install libbluetooth by default (put it behind a configure switch)
+
+- (maybe) rename or re-design DiscoverServices since it's BR/EDR specific
+
 - Add Agent callback for incoming just-works, maybe remote lost key as
   well?
 
-- [done] Reorganize source tree according to RFC sent to
-  linux-bluetooth (Subject: [RFC] Reorganizing the BlueZ source tree)
-
 - [pending] Remove deprecated D-Bus signals, methods and properties
   (ensuring new ones are in place to replace what's removed).
 
-- [pending] Switch to standard D-Bus properties interface
-
-- [pending] Switch to standard object manager interface
+- [pending] Switch plugins to standard D-Bus properties interface
 
 - [pending] Add connect/disconnect callbacks to all btd_profile
   instances that need them and add auto_connect = true to the ones that
@@ -91,19 +80,30 @@ released.
 - [pending] Convert storage to user per-remote device directories and
   ini-file format
 
-- [done] Make mgmtops part of Bluetooth core. mgmt will be the only way
-  to communicate with the kernel in BlueZ so a plugin is not needed
-  anymore. Probably plugins/mgmtops.c -> src/mgmt.c
+Completed items:
+
+- Switch to standard object manager interface
+
+- Switch core to standard D-Bus properties interface
 
-- [done] Related to the telephony architecture rework, figure out how fast
-  connectable should work. - Implemented as a property in the Telephony
-  interface.
+- Remove telephony driver framework
+
+- Move base path to /org/bluez
+
+- Remove GStreamer and libsbc code
+
+- Reorganize source tree according to RFC sent to linux-bluetooth
+  (Subject: [RFC] Reorganizing the BlueZ source tree)
+
+- Make mgmtops part of Bluetooth core. mgmt will be the only way to
+  communicate with the kernel in BlueZ so a plugin is not needed
+  anymore. Probably plugins/mgmtops.c -> src/mgmt.c
 
-- [done] Remove UNIX socket based audio interface (along with ALSA plugin)
+- Remove UNIX socket based audio interface (along with ALSA plugin)
 
-- [done] Remove unmaintained plugins like pnat and maemo6
+- Remove unmaintained plugins like pnat and maemo6
 
-- [done] Remove CreateDevice/CreatePairedDevice and use D-Bus objects for
+- Remove CreateDevice/CreatePairedDevice and use D-Bus objects for
   discovered devices. This fixes the issue of not exposing the address
   type in DeviceFound and the Create* method calls