Removed more graphic stuff, added a little more network stuff
merged?