Progress towards connection routing. Needs a lot of clean up still.