Getting ready for CV 2.0!

A final test before implementation.