-more network work and refactoring