Network stuff is at a working point, Trying to refactor