Added speed upgrades

Scaling is *horribly* off though...