Added TODO on network handler