Added first attempt of network support
Fixings