More stateful handler work-in-progress