More work done to the networking stuff