Some refactoring as well as making H2Vista net poking work.