Feature/68 weaponclass