Network Integration Update

Merged in Greg's and Sam's recent changes into the _Networked version of
the code