Network action additions, preparation for clustering
Merged Guanming's changes with those from the weekend.