Networking refactoring - getting classes in a workable state