More state machine / SPLIT work.