Repo working with all async
More work on making things async