Start working on upstream data-flow + some doc