Added flow.h/.cpp
Merge