Fig flocker changestate yaml 796

Fixes #796
Maybe call the class `ApplicationMarshaller` or something to better express what ti does.