Some cleanup, and getting the build.xml to behave a little better.
Forgot I moved the getPhysicalConnection(), wow I should back off the coffee.
This is actually starting to pass test cases.