Continue to propagate async/await changes
Under 100 errors :) still some changes to go