Refactored so that plain  calls feed the actual results to the promise resolve handler