Network Refactored and JUnit update

network tools fully refactored.  Tested with JUnit