More work to integrating netwire