ShipYard:  allows for upgrades
ShipYard:  upgrade methods fully fleshed out
Ship: Updated with some getter methods
Merge origin/M9 into M9