commit of verification long standing branch

do you want me to implement this? or are we waiting for Cosmin's refactoring? I think you mentioned that at some point?