Correction and simplifications to connections logic.
Modify ethernet to use new Connection logic.