With updates regular updates to the data as ewll
final cut for now, we get all the data and better error handling