Cupcake upgrades

[placeholder until merge-ready]
I like this, though make sure Phaser doesn't already have something built-in