Hi Tim,
I'm glad to hear that you're already working on this. I must admit that
sometimes it's easier to ask you to give new features than fixing the
network topology (that grows most of the times without the proper
planning or without knowledge of future requirements), but as other
platforms handle this scenarios, I thought it fare.
I've posted a note in the bug and if I can help you, don't hesitate asking.
Regards,
Juan Pablo Lorier