Move runner to async

Finish to remove promises in runner