Related to #1001, and a follow-up to #6989

It'd also be nice if we had an animation. Idk if you want that to be a part of #1001 though. If you do punt on the animation, could you just add a note on that issue (or open a new one).