Beginning of fixing Networking issues.