More network work
Merge branch 'master' of github.com:katherineng/terrace