Started adding more network functionality