Network viewer refactor, work in progress