Last commit for the day.

Fixing network issues and integrating everything!