Cupcake upgrades

[placeholder until merge-ready]
Hmm. This doesn't seem very DRY