Fix typo from last night, make Weapon and Shield subclasses of Permanent