Some more moving around and the start of a network interface to allow me to decouple the network communication and add functionality.