Closing in on completing the refactoring of cgv.