cleaned up network... more to be done
Merge pull request #5 from kevinlawrence/network-cleanup

cleaned up network... more to be done