Oob flow

Please review @g-ortuno