Fig flocker changestate yaml 796

Fixes #796
@exarkun - do you think it's worth bothering rewriting this based on above?