Now using async and changed the results calculation to use waterfall