Kk, I'm going to work on some tests for this flow, some thing more end2end and see if anything pops out