Integrate new network code

- Comment out old net code
- Tweak the network class with last minute changes