diff --git a/TODO.md b/TODO.md
index ac784c1..7dbe2f4 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,11 +2,9 @@
 ### GENERAL
 - make debug buffer dump multi-line and byte-gap configurable
 - move +[NSDate OSCImmediate] to a public header
-- test interoperability against Lemur, TouchOSC, Max 6, oF and Cinder
-- look into simple MIDI tunneling example
 - add more in-depth usage info to [README](README.md) for Mac OS X and iOS applications (@rpath and [iOS usage](http://www.blog.montgomerie.net/easy-xcode-static-library-subprojects-and-submodules))
 - remove +[PEOSCMessage displayNameForType:]
-- add CONTRIBUTING.md
+- add a CONTRIBUTING.md
 
 ### MESSAGE
 - pull address validation code out to a class method and use within -[PEOSCMessage initWithData:]
@@ -25,8 +23,9 @@
 - host and port should be readwrite now that collectionless
 - offer connected variant in addition to connectionless?
 
-### RECEIVER
-- consider some sort of simple router
+### ROUTER
+- create a simple router like [omgosc-router](https://github.com/pizthewiz/omgosc-router)
+- investigate mr ray's [OSCQueryProposal](https://github.com/mrRay/OSCQueryProposal)
 
 ### UNIT TESTS
 - message creation from data, bad tagTypeString, empty types
@@ -43,12 +42,12 @@
 - receive data on privileged port, < 1024
 - receive data on a port in use
 
-### MISC
-- sample router? ?*[!-]{,}//
-- example message snooper
+### EXAMPLES
+- update iOS and OS X examples to be a simple PingPong
+- message snooper
+- MIDI tunneler
 
 ### LATER
 - mDNS receiver announcement
 - add socket management layer to allow sharing
 - add TCP and Serial sender/receiver classes via [SLIP](http://en.wikipedia.org/wiki/Serial_Line_Internet_Protocol)
-- allow end points to be discovered through query proposal