working on stuff towards the flow