buncha network refactoring