[WIP] Refactor: promisfy