made some changes to flow, I have a lot of work ahead of me