broken commit - need to rethink how the state is handled across VC's