the new async stuff complicates it for sure