Fix promises niftily, perhaps