More untested networkclient work.