Merge "Initial pass at netvirt model"