Add classes Pirate and Upgrade

Addresses #2