Added some networking stuff
Merge branch 'infinote-dev' into integration