Added Weapon class to fix a TODO in issue #2