More functionality, flow working