This has been on my TODO list for a while.. I'll wait for you to finish discover and will do the rest after that as I think we can reuse a lot of the discover documentaiton for connect and connect-all.