Some initial upgrades to the CV into a more current state