Simplify function and chage name to indicate we expecting a promise