Syncing networking changes back to main repo