Network Integration / Code Re-factor

Almost there, I need max to change some shit in your classes, I am not
familiar to how the logic works.