Minor modifications to network handler, still working on it.