I think I have the state vars all sorted out now.