Added network stuff
Merge branch 'develop'