Cupcake upgrades

[placeholder until merge-ready]
Why is this an ordered list?