Cupcake upgrades

[placeholder until merge-ready]
Comments above these lines instead of on the side would really help