More network lib work - work in progress