Final few changes for network, time to parse