Feature/async refactor

Looks good to me - So just using it in a variable instead of a hardcode did it?