Major network overhaul, untested at this time.
Updated networking.
Additional catch bit- only for testing.
Merge remote-tracking branch 'origin/master'