Will need to move the network methods in here I think