Added Weapon class as well as other things