Pull Request - Networking

This will implement #61.