More state-machining.