Weapon TODO stuff added