All of Emily's updates.

I have no idea what I'm doing, so I hope this works this time!