Overhaul of flow, as well as getting everything to work so fa