Leaving another important TODO
Moving to async but it feels like lipstick more than anything =(