Cleaning up network model API.  Not finished yet.