working on inital flow