Split out CurrentState