dev: more work on flow