Initial refactor of N2VC

No match.