First FlowStatus draft, and cleanup