Started on moving the network portion to seperate class