[SD-1225] Refactor spike to use state