Pretty sure this is mostly right, @elainethale it would be good for you to take a look at this when you can

[#58276724]