Replace Async with Promises/A+