Rewrote most of the classpick/hunter upgrades code