flow: more work-in-progress

Change-Id: I56f8cfe27a2b57008e403ee2dbbe7fd3afdc2c00