Pull cv_test into master

cv_test branch now exhibits all basic wanted functionality, builds properly ready to merge into master