diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index 42002e3a9d..c0eb971d57 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -8179,22 +8179,22 @@ Click again to switch to Manual and Remote">
                         </div>
                         <div class="vehicleweaponrow">
                             <div class="weaponnamewrapper">
-                                <input type="text" name="attr_vehicleweaponname" title="Weapon Name">
+                                <input type="text" name="attr_vehicleweaponname1" title="Weapon Name">
                             </div>
                             <div class="weaponaccuracywrapper">
-                                <input type="text" name="attr_vehicleweaponaccuracy" title="Weapon Accuracy with all Modifications but Ammo">
+                                <input type="text" name="attr_vehicleweaponaccuracy1" title="Weapon Accuracy with all Modifications but Ammo">
                             </div>
                             <div class="weapondvwrapper">
-                                <input type="text" name="attr_vehicleweapondv" title="Weapon Damage Code with all Modifications but Ammo">
+                                <input type="text" name="attr_vehicleweapondv1" title="Weapon Damage Code with all Modifications but Ammo">
                             </div>
                             <div class="weaponapwrapper">
-                                <input type="text" name="attr_vehicleweaponap" title="Weapon Armor Penetration with all Modifications but Ammo">
+                                <input type="text" name="attr_vehicleweaponap1" title="Weapon Armor Penetration with all Modifications but Ammo">
                             </div>
                             <div class="weaponrcwrapper">
-                                <input type="text" name="attr_vehicleweaponrc" title="Weapon Recoil Compensation with all Modifications including Vehicle Body">
+                                <input type="text" name="attr_vehicleweaponrc1" title="Weapon Recoil Compensation with all Modifications including Vehicle Body">
                             </div>
                             <div class="weaponmodewrapper">
-                                <select name="attr_vehicleweaponmode" title="Current Firing Mode of the Weapon">
+                                <select name="attr_vehicleweaponmode1" title="Current Firing Mode of the Weapon">
                                     <option value="11">SS</option>
                                     <option value="31">SA</option>
                                     <option value="63">BF</option>
@@ -8202,14 +8202,14 @@ Click again to switch to Manual and Remote">
                                 </select>
                             </div>
                             <div class="weaponautosoftwrapper">
-                                <input type="text" name="attr_vehicleweaponautosoft" title="Targeting Autosoft on this Vehicle">
+                                <input type="text" name="attr_vehicleweaponautosoft1" title="Targeting Autosoft on this Vehicle">
                             </div>
                             <div class="weaponbonuswrapper">
-                                <input type="text" name="attr_vehicleweaponbonus" title="Any Bonuses to Weapon Skill">
+                                <input type="text" name="attr_vehicleweaponbonus1" title="Any Bonuses to Weapon Skill">
                             </div>
                             <div class="weaponrollwrapper">
-                                <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollautopilot" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy})]]]]}}{{after1=DV([[@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}]]}}"></button>
-                                <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollpilot" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skillrating52}+@{skillbonus52}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[(@{skilldicepool52}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}]]}}"></button>
+                                <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollautopilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname1}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc1}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy1}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft1}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy1})]]]]}}{{after1=DV([[@{vehicleweapondv1}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap1}]]}}"></button>
+                                <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollpilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname1}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skillrating52}+@{skillbonus52}+@{vehicleweaponbonus1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc1}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy1}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[(@{skilldicepool52}+@{vehicleweaponbonus1}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy1}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleweapondv1}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap1}]]}}"></button>
                             </div>
                             <input class="vehicleweaponcheckbox hiddencheckbox" type="checkbox" name="attr_vehicleshowweaponnotes" title="Need more Space?">
                             <div class="checkboxticker vehicleweaponunticked"></div>
@@ -8245,58 +8245,181 @@ Click again to switch to Manual and Remote">
                             </div>
                             <div class="vehicleammorow">
                                 <div class="ammonamewrapper">
-                                    <input type="text" name="attr_vehicleammoname1" title="Name of the Ammunition">
+                                    <input type="text" name="attr_vehicle1ammoname1" title="Name of the Ammunition">
                                 </div>
                                 <div class="ammonumberwrapper">
-                                    <input type="number" name="attr_vehicleammonumber1" title="How many still left in the Clip/Drum/etc">
+                                    <input type="number" name="attr_vehicle1ammonumber1" title="How many still left in the Clip/Drum/etc">
                                 </div>
                                 <div class="ammodvwrapper">
-                                    <input type="text" name="attr_vehicleammodv1" value="0" title="DV change from the Ammunition">
+                                    <input type="text" name="attr_vehicle1ammodv1" value="0" title="DV change from the Ammunition">
                                 </div>
                                 <div class="ammoapwrapper">
-                                    <input type="text" name="attr_vehicleammoap1" value="0" title="AP change from the Ammunition">
+                                    <input type="text" name="attr_vehicle1ammoap1" value="0" title="AP change from the Ammunition">
                                 </div>
                                 <div class="ammoaccwrapper">
-                                    <input type="text" name="attr_vehicleammoacc1" value="0" title="Accuracy change from the Ammunition">
+                                    <input type="text" name="attr_vehicle1ammoacc1" value="0" title="Accuracy change from the Ammunition">
                                 </div>
                                 <div class="ammodescriptionwrapper">
                                     <input type="text" name="attr_vehicleammodescription1" title="Additional Description">
                                 </div>
                                 <div class="ammorollwrapper">
-                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollsimpleautopilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc1})]]]]}}{{after1=DV([[@{vehicleweapondv}+@{vehicleammodv1}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap1}]]}}{{after2=@{vehicleammoname1} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription1}}}"></button>
-                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollsimplepilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skillrating52}+@{skillbonus52}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[(@{skilldicepool52}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc1}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleweapondv}+(@{vehicleammodv1})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+(@{vehicleammoap1})]]}}{{after2=@{vehicleammoname1} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription1}}}"></button>
+                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicle1weaponrollsimpleautopilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname1}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc1}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy1}+@{vehicle1ammoacc1}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft1}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy1}+@{vehicle1ammoacc1})]]]]}}{{after1=DV([[@{vehicleweapondv1}+@{vehicle1ammodv1}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap1}+@{vehicle1ammoap1}]]}}{{after2=@{vehicle1ammoname1} Rounds}}{{after2_num=[[@{vehicleweaponmode1}-floor(@{vehicleweaponmode1}/10)*10]]}}{{description=@{vehicle1ammodescription1}}}"></button>
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicle1weaponrollsimplepilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname1}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skillrating52}+@{skillbonus52}+@{vehicleweaponbonus1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc1}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy1}+@{vehicle1ammoacc1}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[(@{skilldicepool52}+@{vehicleweaponbonus1}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy1}+@{vehicle1ammoacc1}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleweapondv1}+(@{vehicle1ammodv1})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap1}+(@{vehicle1ammoap1})]]}}{{after2=@{vehicle1ammoname1} Rounds}}{{after2_num=[[@{vehicleweaponmode1}-floor(@{vehicleweaponmode1}/10)*10]]}}{{description=@{vehicle1ammodescription1}}}"></button>
                                 </div>
                                 <div class="ammorollwrapper">
-                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollcomplexautopilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc1})]]]]}}{{after1=DV([[@{vehicleammodv1}+@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap1}]]}}{{after2=@{vehicleammoname1} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription1}}}"></button>
-                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollocomplexpilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skillrating52}+@{skillbonus52}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[(@{skilldicepool52}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc1}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleammodv1}+(@{vehicleweapondv})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+(@{vehicleammoap1})]]}}{{after2=@{vehicleammoname1} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription1}}}"></button>
+                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicle1weaponrollcomplexautopilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname1}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc1}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy1}+@{vehicle1ammoacc1}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft1}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy1}+@{vehicle1ammoacc1})]]]]}}{{after1=DV([[@{vehicle1ammodv1}+@{vehicleweapondv1}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap1}+@{vehicle1ammoap1}]]}}{{after2=@{vehicle1ammoname1} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode1}/10)]]}}{{description=@{vehicle1ammodescription1}}}"></button>
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehiclew1eaponrollocomplexpilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname1}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skillrating52}+@{skillbonus52}+@{vehicleweaponbonus1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc1}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy1}+@{vehicle1ammoacc1}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[(@{skilldicepool52}+@{vehicleweaponbonus1}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy1}+@{vehicle1ammoacc1}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicle1ammodv1}+(@{vehicleweapondv1})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap1}+(@{vehicle1ammoap1})]]}}{{after2=@{vehicle1ammoname1} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode1}/10)]]}}{{description=@{vehicle1ammodescription1}}}"></button>
                                 </div>
                             </div>
                             <div class="vehicleammorow">
                                 <div class="ammonamewrapper">
-                                    <input type="text" name="attr_vehicleammoname2" title="Name of the Ammunition">
+                                    <input type="text" name="attr_vehicle1ammoname2" title="Name of the Ammunition">
                                 </div>
                                 <div class="ammonumberwrapper">
-                                    <input type="number" name="attr_vehicleammonumber2" title="How many still left in the Clip/Drum/etc">
+                                    <input type="number" name="attr_vehicle1ammonumber2" title="How many still left in the Clip/Drum/etc">
                                 </div>
                                 <div class="ammodvwrapper">
-                                    <input type="text" name="attr_vehicleammodv2" value="0" title="DV change from the Ammunition">
+                                    <input type="text" name="attr_vehicle1ammodv2" value="0" title="DV change from the Ammunition">
                                 </div>
                                 <div class="ammoapwrapper">
-                                    <input type="text" name="attr_vehicleammoap2" value="0" title="AP change from the Ammunition">
+                                    <input type="text" name="attr_vehicle1ammoap2" value="0" title="AP change from the Ammunition">
                                 </div>
                                 <div class="ammoaccwrapper">
-                                    <input type="text" name="attr_vehicleammoacc2" value="0" title="Accuracy change from the Ammunition">
+                                    <input type="text" name="attr_vehicle1ammoacc2" value="0" title="Accuracy change from the Ammunition">
                                 </div>
                                 <div class="ammodescriptionwrapper">
-                                    <input type="text" name="attr_vehicleammodescription2" title="Additional Description">
+                                    <input type="text" name="attr_vehicle1ammodescription2" title="Additional Description">
                                 </div>
                                 <div class="ammorollwrapper">
-                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollsimpleautopilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc2})]]]]}}{{after1=DV([[@{vehicleweapondv}+@{vehicleammodv2}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap2}]]}}{{after2=@{vehicleammoname2} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription2}}}"></button>
-                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollsimplepilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skillrating52}+@{skillbonus52}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[(@{skilldicepool52}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc2}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleweapondv}+(@{vehicleammodv2})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+(@{vehicleammoap2})]]}}{{after2=@{vehicleammoname2} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription2}}}"></button>
+                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweapon1rollsimpleautopilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname1}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc1}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy1}+@{vehicle1ammoacc2}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft1}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy1}+@{vehicle1ammoacc2})]]]]}}{{after1=DV([[@{vehicleweapondv1}+@{vehicle1ammodv2}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap1}+@{vehicle1ammoap2}]]}}{{after2=@{vehicle1ammoname2} Rounds}}{{after2_num=[[@{vehicleweaponmode1}-floor(@{vehicleweaponmode1}/10)*10]]}}{{description=@{vehicle1ammodescription2}}}"></button>
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweapon1rollsimplepilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname1}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skillrating52}+@{skillbonus52}+@{vehicleweaponbonus1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc1}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy1}+@{vehicle1ammoacc2}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[(@{skilldicepool52}+@{vehicleweaponbonus1}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy1}+@{vehicle1ammoacc2}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleweapondv1}+(@{vehicle1ammodv2})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap1}+(@{vehicle1ammoap2})]]}}{{after2=@{vehicle1ammoname2} Rounds}}{{after2_num=[[@{vehicleweaponmode1}-floor(@{vehicleweaponmode1}/10)*10]]}}{{description=@{vehicle1ammodescription2}}}"></button>
                                 </div>
                                 <div class="ammorollwrapper">
-                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollcomplexautopilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc2})]]]]}}{{after1=DV([[@{vehicleammodv2}+@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap2}]]}}{{after2=@{vehicleammoname2} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription2}}}"></button>
-                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollocomplexpilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skillrating52}+@{skillbonus52}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[(@{skilldicepool52}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc2}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleammodv2}+(@{vehicleweapondv})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+(@{vehicleammoap2})]]}}{{after2=@{vehicleammoname2} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription2}}}"></button>
+                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweapon1rollcomplexautopilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname1}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc1}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy1}+@{vehicle1ammoacc2}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft1}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy1}+@{vehicle1ammoacc2})]]]]}}{{after1=DV([[@{vehicle1ammodv2}+@{vehicleweapondv1}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap1}+@{vehicle1ammoap2}]]}}{{after2=@{vehicle1ammoname2} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode1}/10)]]}}{{description=@{vehicle1ammodescription2}}}"></button>
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweapon1rollocomplexpilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname1}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skillrating52}+@{skillbonus52}+@{vehicleweaponbonus1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc1}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy1}+@{vehicle1ammoacc2}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[(@{skilldicepool52}+@{vehicleweaponbonus1}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy1}+@{vehicle1ammoacc2}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicle1ammodv2}+(@{vehicleweapondv1})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap1}+(@{vehicle1ammoap2})]]}}{{after2=@{vehicle1ammoname2} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode1}/10)]]}}{{description=@{vehicle1ammodescription2}}}"></button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="vehicleweaponrow">
+                            <div class="weaponnamewrapper">
+                                <input type="text" name="attr_vehicleweaponname2" title="Weapon Name">
+                            </div>
+                            <div class="weaponaccuracywrapper">
+                                <input type="text" name="attr_vehicleweaponaccuracy2" title="Weapon Accuracy with all Modifications but Ammo">
+                            </div>
+                            <div class="weapondvwrapper">
+                                <input type="text" name="attr_vehicleweapondv2" title="Weapon Damage Code with all Modifications but Ammo">
+                            </div>
+                            <div class="weaponapwrapper">
+                                <input type="text" name="attr_vehicleweaponap2" title="Weapon Armor Penetration with all Modifications but Ammo">
+                            </div>
+                            <div class="weaponrcwrapper">
+                                <input type="text" name="attr_vehicleweaponrc2" title="Weapon Recoil Compensation with all Modifications including Vehicle Body">
+                            </div>
+                            <div class="weaponmodewrapper">
+                                <select name="attr_vehicleweaponmode2" title="Current Firing Mode of the Weapon">
+                                    <option value="11">SS</option>
+                                    <option value="31">SA</option>
+                                    <option value="63">BF</option>
+                                    <option value="106">FA</option>
+                                </select>
+                            </div>
+                            <div class="weaponautosoftwrapper">
+                                <input type="text" name="attr_vehicleweaponautosoft2" title="Targeting Autosoft on this Vehicle">
+                            </div>
+                            <div class="weaponbonuswrapper">
+                                <input type="text" name="attr_vehicleweaponbonus2" title="Any Bonuses to Weapon Skill">
+                            </div>
+                            <div class="weaponrollwrapper">
+                                <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollautopilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname2}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc2}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy2}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft2}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy2})]]]]}}{{after1=DV([[@{vehicleweapondv2}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap2}]]}}"></button>
+                                <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollpilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname2}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skillrating52}+@{skillbonus52}+@{vehicleweaponbonus2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc2}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy2}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[(@{skilldicepool52}+@{vehicleweaponbonus2}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy2}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleweapondv2}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap2}]]}}"></button>
+                            </div>
+                            <input class="vehicleweaponcheckbox hiddencheckbox" type="checkbox" name="attr_vehicleshowweaponnotes" title="Need more Space?">
+                            <div class="checkboxticker vehicleweaponunticked"></div>
+                            <div class="checkboxticker vehicleweaponticked">X</div>
+                            <div class="vehicleweaponnoteswrapper">
+                                <textarea name="attr_vehicleweaponnotes2" title="Have more Space!"></textarea>
+                            </div>
+                            <div class="vehicleammolabels">
+                                <div class="ammonamewrapper">
+                                    <label class="ammolabel">Ammo Name</label>
+                                </div>
+                                <div class="ammonumberwrapper">
+                                    <label class="ammolabel">Rounds</label>
+                                </div>
+                                <div class="ammodvwrapper">
+                                    <label class="ammolabel">DV Mod</label>
+                                </div>
+                                <div class="ammoapwrapper">
+                                    <label class="ammolabel">AP Mod</label>
+                                </div>
+                                <div class="ammoaccwrapper">
+                                    <label class="ammolabel">Acc Mod</label>
+                                </div>
+                                <div class="ammodescriptionwrapper">
+                                    <label class="ammolabel">Description</label>
+                                </div>
+                                <div class="ammorollwrapper">
+                                    <label class="ammolabel">Simple</label>
+                                </div>
+                                <div class="ammorollwrapper">
+                                    <label class="ammolabel">Complex</label>
+                                </div>
+                            </div>
+                            <div class="vehicleammorow">
+                                <div class="ammonamewrapper">
+                                    <input type="text" name="attr_vehicle2ammoname1" title="Name of the Ammunition">
+                                </div>
+                                <div class="ammonumberwrapper">
+                                    <input type="number" name="attr_vehicle2ammonumber1" title="How many still left in the Clip/Drum/etc">
+                                </div>
+                                <div class="ammodvwrapper">
+                                    <input type="text" name="attr_vehicle2ammodv1" value="0" title="DV change from the Ammunition">
+                                </div>
+                                <div class="ammoapwrapper">
+                                    <input type="text" name="attr_vehicle2ammoap1" value="0" title="AP change from the Ammunition">
+                                </div>
+                                <div class="ammoaccwrapper">
+                                    <input type="text" name="attr_vehicle2ammoacc1" value="0" title="Accuracy change from the Ammunition">
+                                </div>
+                                <div class="ammodescriptionwrapper">
+                                    <input type="text" name="attr_vehicle2ammodescription1" title="Additional Description">
+                                </div>
+                                <div class="ammorollwrapper">
+                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicle2weaponrollsimpleautopilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname2}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc2}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy2}+@{vehicle2ammoacc1}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft2}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy2}+@{vehicle2ammoacc1})]]]]}}{{after1=DV([[@{vehicleweapondv2}+@{vehicle2ammodv1}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap2}+@{vehicle2ammoap1}]]}}{{after2=@{vehicle2ammoname1} Rounds}}{{after2_num=[[@{vehicleweaponmode2}-floor(@{vehicleweaponmode2}/10)*10]]}}{{description=@{vehicle2ammodescription1}}}"></button>
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicle2weaponrollsimplepilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname2}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skillrating52}+@{skillbonus52}+@{vehicleweaponbonus2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc2}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy2}+@{vehicle2ammoacc1}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[(@{skilldicepool52}+@{vehicleweaponbonus2}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy2}+@{vehicle2ammoacc1}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleweapondv2}+(@{vehicle2ammodv1})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap2}+(@{vehicle2ammoap1})]]}}{{after2=@{vehicle2ammoname1} Rounds}}{{after2_num=[[@{vehicleweaponmode2}-floor(@{vehicleweaponmode2}/10)*10]]}}{{description=@{vehicle2ammodescription1}}}"></button>
+                                </div>
+                                <div class="ammorollwrapper">
+                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicle2weaponrollcomplexautopilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname2}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc2}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy2}+@{vehicle2ammoacc1}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft2}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy2}+@{vehicle2ammoacc1})]]]]}}{{after1=DV([[@{vehicle2ammodv1}+@{vehicleweapondv2}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap2}+@{vehicle2ammoap1}]]}}{{after2=@{vehicle2ammoname1} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode2}/10)]]}}{{description=@{vehicle2ammodescription1}}}"></button>
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicle2weaponrollocomplexpilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname2}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skillrating52}+@{skillbonus52}+@{vehicleweaponbonus2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc2}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy2}+@{vehicle2ammoacc1}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[(@{skilldicepool52}+@{vehicleweaponbonus2}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy2}+@{vehicle2ammoacc1}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicle2ammodv1}+(@{vehicleweapondv2})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap2}+(@{vehicle2ammoap1})]]}}{{after2=@{vehicle2ammoname1} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode2}/10)]]}}{{description=@{vehicle2ammodescription1}}}"></button>
+                                </div>
+                            </div>
+                            <div class="vehicleammorow">
+                                <div class="ammonamewrapper">
+                                    <input type="text" name="attr_vehicle2ammoname2" title="Name of the Ammunition">
+                                </div>
+                                <div class="ammonumberwrapper">
+                                    <input type="number" name="attr_vehicle2ammonumber2" title="How many still left in the Clip/Drum/etc">
+                                </div>
+                                <div class="ammodvwrapper">
+                                    <input type="text" name="attr_vehicle2ammodv2" value="0" title="DV change from the Ammunition">
+                                </div>
+                                <div class="ammoapwrapper">
+                                    <input type="text" name="attr_vehicle2ammoap2" value="0" title="AP change from the Ammunition">
+                                </div>
+                                <div class="ammoaccwrapper">
+                                    <input type="text" name="attr_vehicle2ammoacc2" value="0" title="Accuracy change from the Ammunition">
+                                </div>
+                                <div class="ammodescriptionwrapper">
+                                    <input type="text" name="attr_vehicle2ammodescription2" title="Additional Description">
+                                </div>
+                                <div class="ammorollwrapper">
+                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicle2weaponrollsimpleautopilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname2}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc2}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy2}+@{vehicle2ammoacc2}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft2}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy2}+@{vehicle2ammoacc2})]]]]}}{{after1=DV([[@{vehicleweapondv2}+@{vehicle2ammodv2}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap2}+@{vehicle2ammoap2}]]}}{{after2=@{vehicle2ammoname2} Rounds}}{{after2_num=[[@{vehicleweaponmode2}-floor(@{vehicleweaponmode2}/10)*10]]}}{{description=@{vehicle2ammodescription2}}}"></button>
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicle2weaponrollsimplepilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname2}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skillrating52}+@{skillbonus52}+@{vehicleweaponbonus2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc2}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy2}+@{vehicle2ammoacc2}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[(@{skilldicepool52}+@{vehicleweaponbonus2}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy2}+@{vehicle2ammoacc2}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleweapondv2}+(@{vehicle2ammodv2})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap2}+(@{vehicle2ammoap2})]]}}{{after2=@{vehicle2ammoname2} Rounds}}{{after2_num=[[@{vehicleweaponmode2}-floor(@{vehicleweaponmode2}/10)*10]]}}{{description=@{vehicle2ammodescription2}}}"></button>
+                                </div>
+                                <div class="ammorollwrapper">
+                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicle2weaponrollcomplexautopilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname2}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc2}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy2}+@{vehicle2ammoacc2}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft2}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy2}+@{vehicle2ammoacc2})]]]]}}{{after1=DV([[@{vehicle2ammodv2}+@{vehicleweapondv2}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap2}+@{vehicle2ammoap2}]]}}{{after2=@{vehicle2ammoname2} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode2}/10)]]}}{{description=@{vehicle2ammodescription2}}}"></button>
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicle2weaponrollocomplexpilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname2}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skillrating52}+@{skillbonus52}+@{vehicleweaponbonus2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc2}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy2}+@{vehicle2ammoacc2}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[(@{skilldicepool52}+@{vehicleweaponbonus2}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy2}+@{vehicle2ammoacc2}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicle2ammodv2}+(@{vehicleweapondv2})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap2}+(@{vehicle2ammoap2})]]}}{{after2=@{vehicle2ammoname2} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode2}/10)]]}}{{description=@{vehicle2ammodescription2}}}"></button>
                                 </div>
                             </div>
                         </div>
@@ -12403,51 +12526,59 @@ function importSingleVehicle(vehicle, attributes) {
 
     if(vehicle.mods != null){
         if(vehicle.mods.mod.length > 1){
+            var weaponnumber = 1;
             for(var j = 0; j < vehicle.mods.mod.length; j++){
-                importSingleVehicleMod(vehicle.mods.mod[j], newrowid,  attributes);
+                weaponnumber = importSingleVehicleMod(vehicle.mods.mod[j], newrowid, attributes, weaponnumber);
             }
         }else{
             attributes["repeating_vehicles_"+newrowid+"_vehiclenotes"] += vehicle.mods.mod.name + "\n";
-            importSingleVehicleMod(vehicle.mods.mod, newrowid, attributes);
+            importSingleVehicleMod(vehicle.mods.mod, newrowid, attributes, weaponnumber);
         }
     }
 }
 
-function importSingleVehicleMod(mod, newrowid, attributes) {
+const importSingleVehicleMod = (mod, newrowid, attributes, weaponnumber) => {
     attributes["repeating_vehicles_" + newrowid + "_vehiclenotes"] += mod.name + "\n";
     if(mod.weapons != null && mod.weapons.weapon != null){
-        if(mod.weapons.weapon.length > 1){
-           importSingleVehicleWeapon(mod.weapons.weapon[0], newrowid, attributes);
+        if(mod.weapons.length > 1){
+           return importSingleVehicleWeapon(mod.weapons.weapon[0], newrowid, attributes, weaponnumber);
         }
         else {
-            importSingleVehicleWeapon(mod.weapons.weapon, newrowid, attributes);
+           return importSingleVehicleWeapon(mod.weapons.weapon, newrowid, attributes, weaponnumber);
         }
     }
+    return weaponnumber;
 }
 
-function importSingleVehicleWeapon(weapon, newrowid, attributes) {
+const importSingleVehicleWeapon = (weapon, newrowid, attributes, weaponnumber) => {
+    console.log(weaponnumber);
     if(weapon.category != "Gear"){
-        attributes["repeating_vehicles_"+newrowid+"_vehicleweaponname"] = weapon.name;
-        attributes["repeating_vehicles_"+newrowid+"_vehicleweaponaccuracy"] = weapon.accuracy.match(/\d+/g).pop();
+        attributes["repeating_vehicles_"+newrowid+"_vehicleweaponname" + weaponnumber] = weapon.name;
+        attributes["repeating_vehicles_"+newrowid+"_vehicleweaponaccuracy"+ weaponnumber] = weapon.accuracy.match(/\d+/g).pop();
         if(weapon.type == "Ranged")
-            attributes["repeating_vehicles_"+newrowid+"_vehicleweaponrc"] = weapon.rc.match(/\d+/g).pop();
+            attributes["repeating_vehicles_"+newrowid+"_vehicleweaponrc"+ weaponnumber] = weapon.rc.match(/\d+/g).pop();
         if(Number(weapon.ap) != "NaN"){
-            attributes["repeating_vehicles_"+newrowid+"_vehicleweaponap"] = weapon.ap;
+            attributes["repeating_vehicles_"+newrowid+"_vehicleweaponap"+ weaponnumber] = weapon.ap;
         }else{
-            attributes["repeating_vehicles_"+newrowid+"_vehicleweaponap"] = 0;
+            attributes["repeating_vehicles_"+newrowid+"_vehicleweaponap"+ weaponnumber] = 0;
         }
-        attributes["repeating_vehicles_"+newrowid+"_vehicleweapondv"] = weapon.damage_english.match(/\d*/);
-        attributes["repeating_vehicles_"+newrowid+"_vehicleweapondmgtype"] = weapon.damage_english.match(/^\d*/);
-        attributes["repeating_vehicles_"+newrowid+"_vehicleweaponnotes"] = "";
+        attributes["repeating_vehicles_"+newrowid+"_vehicleweapondv"+ weaponnumber] = weapon.damage_english.match(/\d*/);
+        attributes["repeating_vehicles_"+newrowid+"_vehicleweapondmgtype"+ weaponnumber] = weapon.damage_english.match(/^\d*/);
+        attributes["repeating_vehicles_"+newrowid+"_vehicleweaponnotes"+ weaponnumber] = "";
         if(typeof weapon.accessories != "undefined"){
             if(weapon.accessories.accessory.length > 1){
                 for(var h = 0; h < weapon.accessories.accessory.length; h++){
-                    attributes["repeating_vehicles_"+newrowid+"_vehicleweaponnotes"] += weapon.accessories.accessory[h].name+"\n";
+                    attributes["repeating_vehicles_"+newrowid+"_vehicleweaponnotes"+ weaponnumber] += weapon.accessories.accessory[h].name+"\n";
                 }
             }else{
-                attributes["repeating_vehicles_"+newrowid+"_vehicleweaponnotes"] += weapon.accessories.accessory.name+"\n";
+                attributes["repeating_vehicles_"+newrowid+"_vehicleweaponnotes"+ weaponnumber] += weapon.accessories.accessory.name+"\n";
             }
         }
+        console.log(weaponnumber +1);
+        return weaponnumber +1;
+    }
+    else {
+        return weaponnumber;
     }
 }