Data flow + state management

Original message was deleted