updated a bunch of stuff; tried to get existing flow working