CLC-2677 - CFV Implement the new designs

https://jira.media.berkeley.edu/jira/browse/CLC-2677