I'm merging this, but I think we should consider passing some more data through this method, even if we won't use it in our impl. But this isn't critical.