Weapon.java first commit plus some changes