Redid the upgrade naming structure, also added quantity-based upgrades through zubat (inclusive)