The Great Button Refactoring

That's right.

(Button state is still... what the...)