diff --git a/TODO b/TODO
index 2bb67df..301a8fd 100644
--- a/TODO
+++ b/TODO
@@ -60,6 +60,12 @@ BlueZ 5
 Priority/Complexity omitted as all items are required before 5.0 is
 released.
 
+- Fix all btd_profile instances to only have one UUID in remote_uuids,
+  then convert remote_uuids to a single remote_uuid.
+
+- Once the above item is done switch ConnectProfile to match remote_uuid
+  instead of local_uuid (as that's more intuitive).
+
 - Convert obexd to use org.bluez.Profile
 
 - Convert obexd & obex-client to ObjectManager/Properties