VC Moves

From Issue #47

A couple VC moves in the CMS space.