Factored cvf class out into separate file.