diff --git a/Continuum/Continuum.html b/Continuum/Continuum.html
index 6ee56c0017..ae15ee9f7b 100644
--- a/Continuum/Continuum.html
+++ b/Continuum/Continuum.html
@@ -8,13 +8,9 @@
     <b>&nbsp; &nbsp; Combat</b>
     <input type="checkbox" class="sheet-combat-show" title="combat-show" name="attr_combat-show" value="1" checked/>
     <b>&nbsp; &nbsp; Span Log</b>
-    OLD<input type="checkbox" class="sheet-span-log-show" title="span-log-show" name="attr_span-log-show" value="1" checked/>
-    NEW<input type="checkbox" class="sheet-log-show" title="span-log-show" name="attr_span-log-show" value="1" checked/>
+    <input type="checkbox" class="sheet-log-show" title="span-log-show" name="attr_span-log-show" value="1" checked/>
     <b>&nbsp; &nbsp; Yet Log</b>
     <input type="checkbox" class="sheet-yet-show" title="yet-show" name="attr_yet-show" value="1" checked/>
-    <b>&nbsp; &nbsp; Warning</b>
-    <input type="checkbox" class="sheet-warning-show" title="warning-show" name="attr_warning-show" value="1" checked/>
-    <br><Div class="sheet-warning">Due to performance issues with the old style Span Log, a new version has been created. The new version only allows you to calculate 1 Span at a time, but allows you to output the relevant information to the chat pane and copy/paste into a repeating section of text fields for record keeping. Output of the end date to chat is not supported because it crashes chrome. I dont know why that happens. The old Span Log will be removed in a future update, so it is recomended to transfer all data to the recordkeeping area of the new span log.</Div>
     <div class="sheet-stats">
         Name<input type="text" name="attr_character_name">
         Gender <input type="text" style="width: 85px" name="attr_gender"/>
@@ -387,397 +383,56 @@
                 </table>
             </div>
         </div>
-        <textarea style="width: 100%" name="attr_weapon-table"></textarea>
-    </div>
-    <div class="sheet-span-log" style="width: 100%">Span log
-        <fieldset class="repeating_span-log" style="width: 100%">
-            Show Span Block? <input type="checkbox" class="sheet-span-show" title="span-show" name="attr_span-show" value="1" checked/>
-            <div class="sheet-span">
-                    Direction<select name="attr_direction0" style="width: 60px">
-                    <option value="(0)">Rest</option>
-                    <option value="(@{when0}-@{when1}+@{prev-spanspent})">Down</option>
-                    <option value="(@{when0}-@{when1}+@{prev-spanspent}-31536000)">Down(Crossing 0)</option>
-                    <option value="0+@{prev-spanspent}">Level</option>
-                    <option value="(@{when1}-@{when0}+@{prev-spanspent})">Up</option>
-                    <option value="(@{when1}-@{when0}+@{prev-spanspent}-31536000)">Up(Crossing 0)</option>
-                    </select> Starting Age<input type="hidden" name="attr_age-0" value="(@{age-years-0}*31536000 + @{age-days-0}*86400)"></td>
-                    Y<input type="number" name="attr_age-years-0" value="0" style="width: 70px" >
-                    D <input type="number" name="attr_age-days-0" value="0" style="width: 50px" >
-                    Previous Span Spent Y <input type="number" name="attr_prev-years-spent" style="width: 70px"  value="0" >
-                    D <input type="number" name="attr_prev-days-spent" style="width: 50px" value="0" >
-                    h <input type="number" name="attr_prev-hours-spent" value="0" >
-                    m <input type="number" name="attr_prev-minutes-spent" value="0" >
-                    s <input type="number" name="attr_prev-seconds-spent" value="0" >
-                    <input type="hidden" name="attr_prev-spanspent" value="(@{prev-years-spent}*31536000+@{prev-days-spent}*86400+@{prev-hours-spent}*3600+@{prev-minutes-spent}*60+@{prev-seconds-spent})" disabled="true">
-                <table>
-                    <tr style="background-color: #00bfff"><td>Departing</td><td>Y <input type="number" name="attr_0-year" style="width: 70px"  value="0"/></td>
-                    <td>M <select name="attr_0-month" style="width: 100px" >
-                    <option value="0">January</option>
-                    <option value="31">February</option>
-                    <option value="59">March</option>
-                    <option value="90">April</option>
-                    <option value="120">May</option>
-                    <option value="151">June</option>
-                    <option value="181">July</option>
-                    <option value="212">August</option>
-                    <option value="243">September</option>
-                    <option value="273">October</option>
-                    <option value="304">November</option>
-                    <option value="334">December</option>
-                    </select></td><td>D <input type="number" name="attr_0-day" value="0"></td>
-                    <td>h <input type="number" name="attr_0-hour" value="0"></td>
-                    <td>m <input type="number" name="attr_0-minute" value="0"></td>
-                    <td>s <input type="number" name="attr_0-second" value="0"></td>
-                    <td><input type="hidden" name="attr_when0" value="((@{0-year}*31536000)+((@{0-month}+@{0-day})*86400)+(@{0-hour}*3600)+(@{0-minute}*60)+@{0-second})" disabled="true"></td></tr>
-                    <tr style="background-color: #ffd700"><td>Arriving</td><td>Y <input type="number" name="attr_1-year" style="width: 70px" value="0"/></td><td>M <select name="attr_1-month" style="width: 100px" >
-                    <option value="0">January</option>
-                    <option value="31">February</option>
-                    <option value="59">March</option>
-                    <option value="90">April</option>
-                    <option value="120">May</option>
-                    <option value="151">June</option>
-                    <option value="181">July</option>
-                    <option value="212">August</option>
-                    <option value="243">September</option>
-                    <option value="273">October</option>
-                    <option value="304">November</option>
-                    <option value="334">December</option>
-                    </select></td><td>D <input type="number" name="attr_1-day" value="0"></td>
-                    <td>h <input type="number" name="attr_1-hour" value="0"></td>
-                    <td>m <input type="number" name="attr_1-minute" value="0"></td>
-                    <td>s <input type="number" name="attr_1-second" value="0"></td>
-                    <td><input type="hidden" name="attr_when1" value="((@{1-year}*31536000)+((@{1-month}+@{1-day})*86400)+(@{1-hour}*3600)+(@{1-minute}*60)+@{1-second})" disabled="true"></td></tr>
-                </table>
-                Where/Events/Actions<input type="text" name="attr_where0" style="width:600px">
-                <table>
-                    <tr style="background-color: #adff2f"><td>Time Level</td><td>Y <input type="number" name="attr_dur-years-0" style="width: 70px"value="0"></td><td>D <input type="number" name="attr_dur-days-0" style="width: 50px" value="0" ></td>
-                    <td>h <input type="number" name="attr_dur-hours-0" value="0" ></td>
-                    <td>m <input type="number" name="attr_dur-minutes-0" value="0" ></td>
-                    <td>s <input type="number" name="attr_dur-seconds-0" value="0" ></td>
-                    <td><input type="hidden" name="attr_duration0" value="@{dur-years-0}*31536000+@{dur-days-0}*86400+@{dur-hours-0}*3600+@{dur-minutes-0}*60+@{dur-seconds-0}" disabled="true"></td>
-                    <td></td></tr>
-                    <tr><td>Span Spent</td><td>Y <input type="number" name="attr_years-spent0" style="width: 70px"  value="floor(@{spanspent0}/31536000)" disabled="true"></td>
-                    <td>D <input type="number" name="attr_days-spent0" style="width: 50px" value="floor((@{spanspent0}-(@{years-spent0}*31536000))/86400)" disabled="true"></td>
-                    <td>h <input type="number" name="attr_hours-spent0" value="floor((@{spanspent0}-(@{years-spent0}*31536000+@{days-spent0}*86400))/3600)" disabled="true"></td>
-                    <td>m <input type="number" name="attr_minutes-spent0" value="floor((@{spanspent0}-(@{years-spent0}*31536000+@{days-spent0}*86400+@{hours-spent0}*3600))/60)" disabled="true"></td>
-                    <td>s <input type="number" name="attr_seconds-spent0" value="@{spanspent0}-(@{years-spent0}*31536000+@{days-spent0}*86400+@{hours-spent0}*3600+@{minutes-spent0}*60)" disabled="true"></td>
-                    <td></td><td><input type="hidden" name="attr_spanspent0" value="(@{direction0})" disabled="true"></td></tr>
-                    <tr><td>Span Remaining</td><td>Y <input type="number" name="attr_years-remaining0" style="width: 70px"  value="floor(@{spanremaining0}/31536000)" disabled="true"></td>
-                    <td>D <input type="number" name="attr_days-remaining0" style="width: 50px"  value="floor((@{spanremaining0}-(@{years-remaining0}*31536000))/86400)" disabled="true"></td>
-                    <td>h <input type="number" name="attr_hours-remaining0" value="floor((@{spanremaining0}-(@{years-remaining0}*31536000+@{days-remaining0}*86400))/3600)" disabled="true"></td>
-                    <td>m <input type="number" name="attr_minutes-remaining0" value="floor((@{spanremaining0}-(@{years-remaining0}*31536000+@{days-remaining0}*86400+@{hours-remaining0}*3600))/60)" disabled="true"></td>
-                    <td>s <input type="number" name="attr_seconds-remaining0" value="@{spanremaining0}-(@{years-remaining0}*31536000+@{days-remaining0}*86400+@{hours-remaining0}*3600+@{minutes-remaining0}*60)" disabled="true"></td><td><input type="hidden" name="attr_spanremaining0" value="((@{span}*31536000)-@{spanspent0})" disabled="true"></td></tr>
-                </table>
-                <h3 style="background-color: #000; width: 95%; height: 2px"></h3>
-                <br>
-                <table>
-                    <tr><td>Direction</td><td><select name="attr_direction1" style="width: 60px">
-                    <option value="(0-@{spanspent0})">Rest</option>
-                    <option value="(@{when2}-@{when3})">Down</option>
-                    <option value="(@{when2}-@{when3}-31536000)">Down(Crossing 0)</option>
-                    <option value="0">Level</option>
-                    <option value="(@{when3}-@{when2})">Up</option>
-                    <option value="(@{when3}-@{when2}-31536000)">Up(Crossing 0)</option>
-                    </select></td><td>Starting Age<input type="hidden" name="attr_age-1" value="(@{age-0}+@{duration0})"></td>
-                    <td>Y<input type="number" name="attr_age-years-1" value="(floor(@{age-1}/31536000))" style="width: 70px" disabled="true"></td>
-                    <td>D <input type="number" name="attr_age-days-1" value="floor((@{age-1}-(@{age-years-1}*31536000))/86400)" style="width: 50px" disabled="true"></td>
-                    <td style="background-color: #dc143c">departure error= &nbsp;&nbsp;Y<input type="number" name="attr_Yerror1" value="(floor(@{error1}/31536000))" disabled="true">D<input type="number" name="attr_Derror1" value="(floor((@{error1}-(@{Yerror1}*31536000))/86400))" disabled="true">h<input type="number" name="attr_herror1" value="(floor((@{error1}-(@{Yerror1}*31536000+@{Derror1}*86400))/3600))" disabled="true">m<input type="number" name="attr_merror1" value="(floor((@{error1}-(@{Yerror1}*31536000+@{Derror1}*86400+@{herror1}*3600))/60))" disabled="true">s<input type="number" name="attr_serror1" value="(@{error1}-(@{Yerror1}*31536000+@{Derror1}*86400+@{herror1}*3600+@{merror1}*60))" disabled="true"></td>
-                    <td><input type="hidden" name="attr_error1" style="width: 120px" value="((@{when1}+@{duration0})-(@{when2}))" disabled="true"></tr>
-                </table>
-                <table>
-                    <tr style="background-color: #00bfff"><td>Departing</td><td>Y <input type="number" name="attr_2-year" style="width: 70px"  value="0"/></td>
-                    <td>M <select name="attr_2-month" style="width: 100px" >
-                    <option value="0">January</option>
-                    <option value="31">February</option>
-                    <option value="59">March</option>
-                    <option value="90">April</option>
-                    <option value="120">May</option>
-                    <option value="151">June</option>
-                    <option value="181">July</option>
-                    <option value="212">August</option>
-                    <option value="243">September</option>
-                    <option value="273">October</option>
-                    <option value="304">November</option>
-                    <option value="334">December</option>
-                    </select></td><td>D <input type="number" name="attr_2-day" value="0"></td>
-                    <td>h <input type="number" name="attr_2-hour" value="0"></td>
-                    <td>m <input type="number" name="attr_2-minute" value="0"></td>
-                    <td>s <input type="number" name="attr_2-second" value="0"></td>
-                    <td><input type="hidden" name="attr_when2" value="((@{2-year}*31536000)+((@{2-month}+@{2-day})*86400)+(@{2-hour}*3600)+(@{2-minute}*60)+@{2-second})" disabled="true"></td></tr>
-                    <tr style="background-color: #ffd700"><td>Arriving</td><td>Y <input type="number" name="attr_3-year" style="width: 70px" value="0"/></td><td>M <select name="attr_3-month" style="width: 100px" >
-                    <option value="0">January</option>
-                    <option value="31">February</option>
-                    <option value="59">March</option>
-                    <option value="90">April</option>
-                    <option value="120">May</option>
-                    <option value="151">June</option>
-                    <option value="181">July</option>
-                    <option value="212">August</option>
-                    <option value="243">September</option>
-                    <option value="273">October</option>
-                    <option value="304">November</option>
-                    <option value="334">December</option>
-                    </select></td><td>D <input type="number" name="attr_3-day" value="0"></td>
-                    <td>h <input type="number" name="attr_3-hour" value="0"></td>
-                    <td>m <input type="number" name="attr_3-minute" value="0"></td>
-                    <td>s <input type="number" name="attr_3-second" value="0"></td>
-                    <td><input type="hidden" name="attr_when3" value="((@{3-year}*31536000)+((@{3-month}+@{3-day})*86400)+(@{3-hour}*3600)+(@{3-minute}*60)+@{3-second})" disabled="true"></td></tr>
-                </table>
-                Where/Events/Actions<input type="text" name="attr_where1" style="width:600px">
-                <table>
-                    <tr style="background-color: #adff2f"><td>Time Level</td><td>Y <input type="number" name="attr_dur-years-1" value="0"></td>
-                    <td>D <input type="number" name="attr_dur-days-1" value="0" ></td>
-                    <td>h <input type="number" name="attr_dur-hours-1" value="0" ></td>
-                    <td>m <input type="number" name="attr_dur-minutes-1" value="0" ></td>
-                    <td>s <input type="number" name="attr_dur-seconds-1" value="0" ></td>
-                    <td><input type="hidden" name="attr_duration1" value="@{dur-years-1}*31536000+@{dur-days-1}*86400+@{dur-hours-1}*3600+@{dur-minutes-1}*60+@{dur-seconds-1}" disabled="true"></td>
-                    <td></td></tr>
-                    <tr><td>Span Spent</td><td>Y <input type="number" name="attr_years-spent1" style="width: 70px"  value="floor(@{spanspent1}/31536000)" disabled="true"></td>
-                    <td>D <input type="number" name="attr_days-spent1" style="width: 50px"  value="floor((@{spanspent1}-(@{years-spent1}*31536000))/86400)" disabled="true"></td>
-                    <td>h <input type="number" name="attr_hours-spent1" value="floor((@{spanspent1}-(@{years-spent1}*31536000+@{days-spent1}*86400))/3600)" disabled="true"></td>
-                    <td>m <input type="number" name="attr_minutes-spent1" value="floor((@{spanspent1}-(@{years-spent1}*31536000+@{days-spent1}*86400+@{hours-spent1}*3600))/60)" disabled="true"></td>
-                    <td>s <input type="number" name="attr_seconds-spent1" value="@{spanspent1}-(@{years-spent1}*31536000+@{days-spent1}*86400+@{hours-spent1}*3600+@{minutes-spent1}*60)" disabled="true"></td><td></td>
-                    <td><input type="hidden" name="attr_spanspent1" value="(@{direction1}+@{spanspent0})" disabled="true"></td></tr>
-                    <tr><td>Span Remaining</td><td>Y <input type="number" name="attr_years-remaining1" style="width: 70px"  value="floor(@{spanremaining1}/31536000)" disabled="true"></td>
-                    <td>D <input type="number" name="attr_days-remaining1" style="width: 50px"  value="floor((@{spanremaining1}-(@{years-remaining1}*31536000))/86400)" disabled="true"></td>
-                    <td>h <input type="number" name="attr_hours-remaining1" value="floor((@{spanremaining1}-(@{years-remaining1}*31536000+@{days-remaining1}*86400))/3600)" disabled="true"></td>
-                    <td>m <input type="number" name="attr_minutes-remaining1" value="floor((@{spanremaining1}-(@{years-remaining1}*31536000+@{days-remaining1}*86400+@{hours-remaining1}*3600))/60)" disabled="true"></td>
-                    <td>s <input type="number" name="attr_seconds-remaining1" value="@{spanremaining1}-(@{years-remaining1}*31536000+@{days-remaining1}*86400+@{hours-remaining1}*3600+@{minutes-remaining1}*60)" disabled="true"></td>
-                    <td></td><td><input type="hidden" name="attr_spanremaining1" value="((@{span}*31536000)-@{spanspent1})" disabled="true"></td></tr>
-                </table>
-                <h3 style="background-color: #000; width: 95%; height: 2px"></h3>
-                <br>
-                <table>
-                    <tr><td>Direction</td><td><select name="attr_direction2" style="width: 60px">
-                    <option value="(0-@{spanspent1})">Rest</option>
-                    <option value="(@{when4}-@{when5})">Down</option>
-                    <option value="(@{when4}-@{when5}-31536000)">Down(Crossing 0)</option>
-                    <option value="0">Level</option>
-                    <option value="(@{when5}-@{when4})">Up</option>
-                    <option value="(@{when5}-@{when4}-31536000)">Up(Crossing 0)</option>
-                    </select></td><td>Starting Age<input type="hidden" name="attr_age-2" value="(@{age-1}+@{duration1})"></td><td>Y<input type="number" name="attr_age-years-2" value="(floor(@{age-2}/31536000))" style="width: 70px" disabled="true"></td>
-                    <td>D <input type="number" name="attr_days-2" value="floor((@{age-2}-(@{age-years-2}*31536000))/86400)" style="width: 50px" disabled="true"></td>
-                    <td style="background-color: #dc143c">departure error= &nbsp;&nbsp;Y<input type="number" name="attr_Yerror2" value="(floor(@{error2}/31536000))" disabled="true">D<input type="number" name="attr_Derror2" value="(floor((@{error2}-(@{Yerror2}*31536000))/86400))" disabled="true">h<input type="number" name="attr_herror2" value="(floor((@{error2}-(@{Yerror2}*31536000+@{Derror2}*86400))/3600))" disabled="true">m<input type="number" name="attr_merror2" value="(floor((@{error2}-(@{Yerror2}*31536000+@{Derror2}*86400+@{herror2}*3600))/60))" disabled="true">s<input type="number" name="attr_serror2" value="(@{error2}-(@{Yerror2}*31536000+@{Derror2}*86400+@{herror2}*3600+@{merror2}*60))" disabled="true"></td>
-                    <td><input type="hidden" name="attr_error2" value="((@{when3}+@{duration1})-(@{when4}))" disabled="true"></tr>
-                </table>
-                <table>
-                    <tr style="background-color: #00bfff"><td>Departing</td><td>Y <input type="number" name="attr_4-year" style="width: 70px"  value="0"/></td>
-                    <td>M <select name="attr_4-month" style="width: 100px" >
-                    <option value="0">January</option>
-                    <option value="31">February</option>
-                    <option value="59">March</option>
-                    <option value="90">April</option>
-                    <option value="120">May</option>
-                    <option value="151">June</option>
-                    <option value="181">July</option>
-                    <option value="212">August</option>
-                    <option value="243">September</option>
-                    <option value="273">October</option>
-                    <option value="304">November</option>
-                    <option value="334">December</option>
-                    </select></td><td>D <input type="number" name="attr_4-day" value="0"></td>
-                    <td>h <input type="number" name="attr_4-hour" value="0"></td>
-                    <td>m <input type="number" name="attr_4-minute" value="0"></td>
-                    <td>s <input type="number" name="attr_4-second" value="0"></td>
-                    <td><input type="hidden" name="attr_when4" value="((@{4-year}*31536000)+((@{4-month}+@{4-day})*86400)+(@{4-hour}*3600)+(@{4-minute}*60)+@{4-second})" disabled="true"></td></tr>
-                    <tr style="background-color: #ffd700"><td>Arriving</td><td>Y <input type="number" name="attr_5-year" style="width: 70px" value="0"/></td><td>M <select name="attr_5-month" style="width: 100px" >
-                    <option value="0">January</option>
-                    <option value="31">February</option>
-                    <option value="59">March</option>
-                    <option value="90">April</option>
-                    <option value="120">May</option>
-                    <option value="151">June</option>
-                    <option value="181">July</option>
-                    <option value="212">August</option>
-                    <option value="243">September</option>
-                    <option value="273">October</option>
-                    <option value="304">November</option>
-                    <option value="334">December</option>
-                    </select></td><td>D <input type="number" name="attr_5-day" value="0"></td>
-                    <td>h <input type="number" name="attr_5-hour" value="0"></td>
-                    <td>m <input type="number" name="attr_5-minute" value="0"></td>
-                    <td>s <input type="number" name="attr_5-second" value="0"></td>
-                    <td><input type="hidden" name="attr_when5" value="((@{5-year}*31536000)+((@{5-month}+@{5-day})*86400)+(@{5-hour}*3600)+(@{5-minute}*60)+@{5-second})" disabled="true"></td></tr>
-                </table>
-                Where/Events/Actions<input type="text" name="attr_where2" style="width:600px">
-                <table>
-                    <tr style="background-color: #adff2f"><td>Time Level</td><td>Y <input type="number" name="attr_dur-years-2" value="0"></td>
-                    <td>D <input type="number" name="attr_dur-days-2" value="0" ></td>
-                    <td>h <input type="number" name="attr_dur-hours-2" value="0" ></td>
-                    <td>m <input type="number" name="attr_dur-minutes-2" value="0" ></td>
-                    <td>s <input type="number" name="attr_dur-seconds-2" value="0" ></td>
-                    <td><input type="hidden" name="attr_duration2" value="@{dur-years-2}*31536000+@{dur-days-2}*86400+@{dur-hours-2}*3600+@{dur-minutes-2}*60+@{dur-seconds-2}" disabled="true"></td>
-                    <td></td></tr>
-                    <tr><td>Span Spent</td><td>Y <input type="number" name="attr_years-spent2" style="width: 70px"  value="floor(@{spanspent2}/31536000)" disabled="true"></td>
-                    <td>D <input type="number" name="attr_days-spent2" style="width: 50px"  value="floor((@{spanspent2}-(@{years-spent2}*31536000))/86400)" disabled="true"></td>
-                    <td>h <input type="number" name="attr_hours-spent2" value="floor((@{spanspent2}-(@{years-spent2}*31536000+@{days-spent2}*86400))/3600)" disabled="true"></td>
-                    <td>m <input type="number" name="attr_minutes-spent2" value="floor((@{spanspent2}-(@{years-spent2}*31536000+@{days-spent2}*86400+@{hours-spent2}*3600))/60)" disabled="true"></td>
-                    <td>s <input type="number" name="attr_seconds-spent2" value="@{spanspent2}-(@{years-spent2}*31536000+@{days-spent2}*86400+@{hours-spent2}*3600+@{minutes-spent2}*60)" disabled="true"></td><td></td>
-                    <td><input type="hidden" name="attr_spanspent2" value="(@{direction2}+@{spanspent1})" disabled="true"></td></tr>
-                    <tr><td>Span Remaining</td><td>Y <input type="number" name="attr_years-remaining2" style="width: 70px"  value="floor(@{spanremaining2}/31536000)" disabled="true"></td>
-                    <td>D <input type="number" name="attr_days-remaining2" style="width: 50px"  value="floor((@{spanremaining2}-(@{years-remaining2}*31536000))/86400)" disabled="true"></td>
-                    <td>h <input type="number" name="attr_hours-remaining2" value="floor((@{spanremaining2}-(@{years-remaining2}*31536000+@{days-remaining2}*86400))/3600)" disabled="true"></td>
-                    <td>m <input type="number" name="attr_minutes-remaining2" value="floor((@{spanremaining2}-(@{years-remaining2}*31536000+@{days-remaining2}*86400+@{hours-remaining2}*3600))/60)" disabled="true"></td>
-                    <td>s <input type="number" name="attr_seconds-remaining2" value="@{spanremaining2}-(@{years-remaining2}*31536000+@{days-remaining2}*86400+@{hours-remaining2}*3600+@{minutes-remaining2}*60)" disabled="true"></td>
-                    <td></td><td><input type="hidden" name="attr_spanremaining2" value="((@{span}*31536000)-@{spanspent2})" disabled="true"></td></tr>
-                </table>
-                <h3 style="background-color: #000; width: 95%; height: 2px"></h3>
-                <br>
-                <table>
-                    <tr><td>Direction</td><td><select name="attr_direction3" style="width: 60px">
-                    <option value="(0-@{spanspent1})">Rest</option>
-                    <option value="(@{when6}-@{when7})">Down</option>
-                    <option value="(@{when6}-@{when7}-31536000)">Down(Crossing 0)</option>
-                    <option value="0">Level</option>
-                    <option value="(@{when7}-@{when6})">Up</option>
-                    <option value="(@{when7}-@{when6}-31536000)">Up(Crossing 0)</option>
-                    </select></td><td>Starting Age<input type="hidden" name="attr_age-3" value="(@{age-2}+@{duration2})"></td><td>Y<input type="number" name="attr_age-years-3" value="(floor(@{age-3}/31536000))" style="width: 70px" disabled="true"></td>
-                    <td>D <input type="number" name="attr_days-3" value="floor((@{age-3}-(@{age-years-3}*31536000))/86400)" style="width: 50px" disabled="true"></td>
-                    <td style="background-color: #dc143c">departure error= &nbsp;&nbsp;Y<input type="number" name="attr_Yerror3" value="(floor(@{error3}/31536000))" disabled="true">D<input type="number" name="attr_Derror3" value="(floor((@{error3}-(@{Yerror3}*31536000))/86400))" disabled="true">h<input type="number" name="attr_herror3" value="(floor((@{error3}-(@{Yerror3}*31536000+@{Derror3}*86400))/3600))" disabled="true">m<input type="number" name="attr_merror3" value="(floor((@{error3}-(@{Yerror3}*31536000+@{Derror3}*86400+@{herror3}*3600))/60))" disabled="true">s<input type="number" name="attr_serror3" value="(@{error3}-(@{Yerror3}*31536000+@{Derror3}*86400+@{herror3}*3600+@{merror3}*60))" disabled="true"></td>
-                    <td><input type="hidden" name="attr_error3" value="((@{when5}+@{duration2})-(@{when6}))" disabled="true"></tr>
-                </table>
-                <table>
-                    <tr style="background-color: #00bfff"><td>Departing</td><td>Y <input type="number" name="attr_6-year" style="width: 70px"  value="0"/></td>
-                    <td>M <select name="attr_6-month" style="width: 100px" >
-                    <option value="0">January</option>
-                    <option value="31">February</option>
-                    <option value="59">March</option>
-                    <option value="90">April</option>
-                    <option value="120">May</option>
-                    <option value="151">June</option>
-                    <option value="181">July</option>
-                    <option value="212">August</option>
-                    <option value="243">September</option>
-                    <option value="273">October</option>
-                    <option value="304">November</option>
-                    <option value="334">December</option>
-                    </select></td><td>D <input type="number" name="attr_6-day" value="0"></td>
-                    <td>h <input type="number" name="attr_6-hour" value="0"></td>
-                    <td>m <input type="number" name="attr_6-minute" value="0"></td>
-                    <td>s <input type="number" name="attr_6-second" value="0"></td>
-                    <td><input type="hidden" name="attr_when6" value="((@{6-year}*31536000)+((@{6-month}+@{6-day})*86400)+(@{6-hour}*3600)+(@{6-minute}*60)+@{6-second})" disabled="true"></td></tr>
-                    <tr style="background-color: #ffd700"><td>Arriving</td><td>Y <input type="number" name="attr_7-year" style="width: 70px" value="0"/></td><td>M <select name="attr_7-month" style="width: 100px" >
-                    <option value="0">January</option>
-                    <option value="31">February</option>
-                    <option value="59">March</option>
-                    <option value="90">April</option>
-                    <option value="120">May</option>
-                    <option value="151">June</option>
-                    <option value="181">July</option>
-                    <option value="212">August</option>
-                    <option value="243">September</option>
-                    <option value="273">October</option>
-                    <option value="304">November</option>
-                    <option value="334">December</option>
-                    </select></td><td>D <input type="number" name="attr_7-day" value="0"></td>
-                    <td>h <input type="number" name="attr_7-hour" value="0"></td>
-                    <td>m <input type="number" name="attr_7-minute" value="0"></td>
-                    <td>s <input type="number" name="attr_7-second" value="0"></td>
-                    <td><input type="hidden" name="attr_when7" value="((@{7-year}*31536000)+((@{7-month}+@{7-day})*86400)+(@{7-hour}*3600)+(@{7-minute}*60)+@{7-second})" disabled="true"></td></tr>
-                </table>
-                Where/Events/Actions<input type="text" name="attr_where3" style="width:600px">
-                <table>
-                    <tr style="background-color: #adff2f"><td>Time Level</td><td>Y <input type="number" name="attr_dur-years-3" value="0"></td>
-                    <td>D <input type="number" name="attr_dur-days-3" value="0" ></td>
-                    <td>h <input type="number" name="attr_dur-hours-3" value="0" ></td>
-                    <td>m <input type="number" name="attr_dur-minutes-3" value="0" ></td>
-                    <td>s <input type="number" name="attr_dur-seconds-3" value="0" ></td>
-                    <td><input type="hidden" name="attr_duration3" value="@{dur-years-3}*31536000+@{dur-days-3}*86400+@{dur-hours-3}*3600+@{dur-minutes-3}*60+@{dur-seconds-3}" disabled="true"></td>
-                    <td></td></tr>
-                    <tr><td>Span Spent</td><td>Y <input type="number" name="attr_years-spent3" style="width: 70px"  value="floor(@{spanspent3}/31536000)" disabled="true"></td>
-                    <td>D <input type="number" name="attr_days-spent3" style="width: 50px"  value="floor((@{spanspent3}-(@{years-spent3}*31536000))/86400)" disabled="true"></td>
-                    <td>h <input type="number" name="attr_hours-spent3" value="floor((@{spanspent3}-(@{years-spent3}*31536000+@{days-spent3}*86400))/3600)" disabled="true"></td>
-                    <td>m <input type="number" name="attr_minutes-spent3" value="floor((@{spanspent3}-(@{years-spent3}*31536000+@{days-spent3}*86400+@{hours-spent3}*3600))/60)" disabled="true"></td>
-                    <td>s <input type="number" name="attr_seconds-spent3" value="@{spanspent3}-(@{years-spent3}*31536000+@{days-spent3}*86400+@{hours-spent3}*3600+@{minutes-spent3}*60)" disabled="true"></td><td></td>
-                    <td><input type="hidden" name="attr_spanspent3" value="(@{direction3}+@{spanspent2})" disabled="true"></td></tr>
-                    <tr><td>Span Remaining</td><td>Y <input type="number" name="attr_years-remaining3" style="width: 70px"  value="floor(@{spanremaining3}/31536000)" disabled="true"></td>
-                    <td>D <input type="number" name="attr_days-remaining3" style="width: 50px"  value="floor((@{spanremaining3}-(@{years-remaining3}*31536000))/86400)" disabled="true"></td>
-                    <td>h <input type="number" name="attr_hours-remaining3" value="floor((@{spanremaining3}-(@{years-remaining3}*31536000+@{days-remaining3}*86400))/3600)" disabled="true"></td>
-                    <td>m <input type="number" name="attr_minutes-remaining3" value="floor((@{spanremaining3}-(@{years-remaining3}*31536000+@{days-remaining3}*86400+@{hours-remaining3}*3600))/60)" disabled="true"></td>
-                    <td>s <input type="number" name="attr_seconds-remaining3" value="@{spanremaining3}-(@{years-remaining3}*31536000+@{days-remaining3}*86400+@{hours-remaining3}*3600+@{minutes-remaining3}*60)" disabled="true"></td>
-                    <td></td><td><input type="hidden" name="attr_spanremaining3" value="((@{span}*31536000)-@{spanspent3})" disabled="true"></td></tr>
-                </table>
-                <h3 style="background-color: #000; width: 95%; height: 2px"></h3>
-                <br>
-                <table>
-                    <tr><td>Direction</td><td><select name="attr_direction4" style="width: 60px">
-                    <option value="(0-@{spanspent1})">Rest</option>
-                    <option value="(@{when8}-@{when9})">Down</option>
-                    <option value="(@{when8}-@{when9}-31536000)">Down(Crossing 0)</option>
-                    <option value="0">Level</option>
-                    <option value="(@{when9}-@{when8})">Up</option>
-                    <option value="(@{when9}-@{when8}-31536000)">Up(Crossing 0)</option>
-                    </select></td><td>Starting Age<input type="hidden" name="attr_age-4" value="(@{age-3}+@{duration3})"></td><td>Y<input type="number" name="attr_age-years-4" value="(floor(@{age-4}/31536000))" style="width: 70px" disabled="true"></td>
-                    <td>D <input type="number" name="attr_days-4" value="floor((@{age-4}-(@{age-years-4}*31536000))/86400)" style="width: 50px" disabled="true"></td>
-                    <td style="background-color: #dc143c">departure error= &nbsp;&nbsp;Y<input type="number" name="attr_Yerror4" value="(floor(@{error4}/31536000))" disabled="true">D<input type="number" name="attr_Derror4" value="(floor((@{error4}-(@{Yerror4}*31536000))/86400))" disabled="true">h<input type="number" name="attr_herror4" value="(floor((@{error4}-(@{Yerror4}*31536000+@{Derror4}*86400))/3600))" disabled="true">m<input type="number" name="attr_merror4" value="(floor((@{error4}-(@{Yerror4}*31536000+@{Derror4}*86400+@{herror4}*3600))/60))" disabled="true">s<input type="number" name="attr_serror4" value="(@{error4}-(@{Yerror4}*31536000+@{Derror4}*86400+@{herror4}*3600+@{merror4}*60))" disabled="true"></td>
-                    <td><input type="hidden" name="attr_error4" value="((@{when7}+@{duration3})-(@{when8}))" disabled="true"></tr>
-                </table>
-                <table>
-                    <tr style="background-color: #00bfff"><td>Departing</td><td>Y <input type="number" name="attr_8-year" style="width: 70px"  value="0"/></td>
-                    <td>M <select name="attr_8-month" style="width: 100px" >
-                    <option value="0">January</option>
-                    <option value="31">February</option>
-                    <option value="59">March</option>
-                    <option value="90">April</option>
-                    <option value="120">May</option>
-                    <option value="151">June</option>
-                    <option value="181">July</option>
-                    <option value="212">August</option>
-                    <option value="243">September</option>
-                    <option value="273">October</option>
-                    <option value="304">November</option>
-                    <option value="334">December</option>
-                    </select></td><td>D <input type="number" name="attr_8-day" value="0"></td>
-                    <td>h <input type="number" name="attr_8-hour" value="0"></td>
-                    <td>m <input type="number" name="attr_8-minute" value="0"></td>
-                    <td>s <input type="number" name="attr_8-second" value="0"></td>
-                    <td><input type="hidden" name="attr_when8" value="((@{8-year}*31536000)+((@{8-month}+@{8-day})*86400)+(@{8-hour}*3600)+(@{8-minute}*60)+@{8-second})" disabled="true"></td></tr>
-                    <tr style="background-color: #ffd700"><td>Arriving</td><td>Y <input type="number" name="attr_9-year" style="width: 70px" value="0"/></td><td>M <select name="attr_9-month" style="width: 100px" >
-                    <option value="0">January</option>
-                    <option value="31">February</option>
-                    <option value="59">March</option>
-                    <option value="90">April</option>
-                    <option value="120">May</option>
-                    <option value="151">June</option>
-                    <option value="181">July</option>
-                    <option value="212">August</option>
-                    <option value="243">September</option>
-                    <option value="273">October</option>
-                    <option value="304">November</option>
-                    <option value="334">December</option>
-                    </select></td><td>D <input type="number" name="attr_9-day" value="0"></td>
-                    <td>h <input type="number" name="attr_9-hour" value="0"></td>
-                    <td>m <input type="number" name="attr_9-minute" value="0"></td>
-                    <td>s <input type="number" name="attr_9-second" value="0"></td>
-                    <td><input type="hidden" name="attr_when9"  value="((@{9-year}*31536000)+((@{9-month}+@{9-day})*86400)+(@{9-hour}*3600)+(@{9-minute}*60)+@{9-second})" disabled="true"></td></tr>
-                </table>
-                Where/Events/Actions<input type="text" name="attr_where4" style="width:600px">
-                <table>
-                    <tr style="background-color: #adff2f"><td>Time Level</td><td>Y <input type="number" name="attr_dur-years-4" value="0"></td>
-                    <td>D <input type="number" name="attr_dur-days-4" value="0" ></td>
-                    <td>h <input type="number" name="attr_dur-hours-4" value="0" ></td>
-                    <td>m <input type="number" name="attr_dur-minutes-4" value="0" ></td>
-                    <td>s <input type="number" name="attr_dur-seconds-4" value="0" ></td>
-                    <td><input type="hidden" name="attr_duration4" value="@{dur-years-4}*31536000+@{dur-days-4}*86400+@{dur-hours-4}*3600+@{dur-minutes-4}*60+@{dur-seconds-4}" disabled="true"></td>
-                    <td></td></tr>
-                    <tr><td>Span Spent</td><td>Y <input type="number" name="attr_years-spent4" style="width: 70px"  value="floor(@{spanspent4}/31536000)" disabled="true"></td>
-                    <td>D <input type="number" name="attr_days-spent4" style="width: 50px"  value="floor((@{spanspent4}-(@{years-spent4}*31536000))/86400)" disabled="true"></td>
-                    <td>h <input type="number" name="attr_hours-spent4" value="floor((@{spanspent4}-(@{years-spent4}*31536000+@{days-spent4}*86400))/3600)" disabled="true"></td>
-                    <td>m <input type="number" name="attr_minutes-spent4" value="floor((@{spanspent4}-(@{years-spent4}*31536000+@{days-spent4}*86400+@{hours-spent4}*3600))/60)" disabled="true"></td>
-                    <td>s <input type="number" name="attr_seconds-spent4" value="@{spanspent4}-(@{years-spent4}*31536000+@{days-spent4}*86400+@{hours-spent4}*3600+@{minutes-spent4}*60)" disabled="true"></td><td></td>
-                    <td><input type="hidden" name="attr_spanspent4" value="(@{direction4}+@{spanspent3})" disabled="true"></td></tr>
-                    <tr><td>Span Remaining</td><td>Y <input type="number" name="attr_years-remaining4" style="width: 70px"  value="floor(@{spanremaining4}/31536000)" disabled="true"></td>
-                    <td>D <input type="number" name="attr_days-remaining4" style="width: 50px"  value="floor((@{spanremaining4}-(@{years-remaining4}*31536000))/86400)" disabled="true"></td>
-                    <td>h <input type="number" name="attr_hours-remaining4" value="floor((@{spanremaining4}-(@{years-remaining4}*31536000+@{days-remaining4}*86400))/3600)" disabled="true"></td>
-                    <td>m <input type="number" name="attr_minutes-remaining4" value="floor((@{spanremaining4}-(@{years-remaining4}*31536000+@{days-remaining4}*86400+@{hours-remaining4}*3600))/60)" disabled="true"></td>
-                    <td>s <input type="number" name="attr_seconds-remaining4" value="@{spanremaining4}-(@{years-remaining4}*31536000+@{days-remaining4}*86400+@{hours-remaining4}*3600+@{minutes-remaining4}*60)" disabled="true"></td>
-                    <td></td><td><input type="hidden" name="attr_spanremaining4" value="((@{span}*31536000)-@{spanspent4})" disabled="true"></td>
-                    <td>Ending Age <input type="hidden" name="attr_age-5" value="(@{age-4}+@{duration4})"></td><td>Y<input type="number" name="attr_age-years-5" value="(floor(@{age-5}/31536000))" style="width: 70px" disabled="true"></td>
-                    <td>D <input type="number" name="attr_days-5" value="floor((@{age-5}-(@{age-years-5}*31536000))/86400)" style="width: 50px" disabled="true"></td></tr>
-                </table>
-            </div>
-            <hr>
+    <div class="sheet-melee-combat-skills">
+        Melee Weapons
+        <fieldset class="repeating_melee-combat_skills">
+            Weapon Name <input type="text" style="width: 200px" name="attr_melee-weapon-name" />
+            Skill Rating <input type="number" name="attr_melee-weapon-rating" style="width: 50px" value="0" />
+            Weight <input type="number" name="attr_melee-weapon-weight" style="width: 50px" value="0" />
+            Damage <input type="number" name="attr_melee-damage" style="width: 50px" value="0" />
+            Conceal <input type="number" name="attr_melee-weapon-conceal" style="width: 50px" value="0" />
+            Length <input type="number" name="attr_melee-weapon-length" style="width: 50px" value="0" />
+            <br>
+            <button type="roll" name="attr_weapon-roll" value="&{template:melee} {{name=@{character_name}'s}} {{attack=@{melee-weapon-name} attack [[{@{melee-weapon-rating}[rating]-@{total-IP}[penalties]-1d10}]]}} {{0=[[0+@{melee-damage}]]}}{{1=[[1+@{melee-damage}]]}}{{2=[[2+@{melee-damage}]]}}{{3=[[3+@{melee-damage}]]}}{{4=[[4+@{melee-damage}]]}}{{5=[[5+@{melee-damage}]]}}{{6=[[6+@{melee-damage}]]}}{{7=[[7+@{melee-damage}]]}}{{8=[[8+@{melee-damage}]]}}{{9=[[9+@{melee-damage}]]}}{{10=[[10+@{melee-damage}]]}}{{11=[[11+@{melee-damage}]]}}{{12=[[12+@{melee-damage}]]}}{{13=[[13+@{melee-damage}]]}}{{14=[[14+@{melee-damage}]]}}{{15=[[15+@{melee-damage}]]}}{{16=[[16+@{melee-damage}]]}}{{17=[[17+@{melee-damage}]]}}">Roll Attack</button>
+            Notes <input type="text" style="width: 600px" name="attr_melee-weapon-notes" />
         </fieldset>
+        <br>
+        Ranged Weapons
+        <fieldset class="repeating_ranged-combat_skills">
+            Weapon Name <input type="text" style="width: 200px" name="attr_ranged-weapon-name" />
+            Skill Rating <input type="number" name="attr_ranged-weapon-rating" style="width: 50px" value="0" />
+            Weight <input type="number" name="attr_ranged-weapon-weight" style="width: 50px" value="0" />
+            Conceal <input type="number" name="attr_ranged-weapon-conceal" style="width: 50px" value="0" />
+            Length <input type="number" name="attr_ranged-weapon-length" style="width: 50px" value="0" />
+            <br>
+            Ammo<input type="number" name="attr_ammo" style="width: 50px" value="0" />
+            Rate of Fire<input type="number" name="attr_rof" style="width: 50px" value="0" />
+            Damage Values D<input type="number" name="attr_ranged-damage-d" style="width: 50px" value="0" />
+            C<input type="number" name="attr_ranged-damage-c" style="width: 50px" value="0" />
+            B<input type="number" name="attr_ranged-damage-b" style="width: 50px" value="0" />
+            A<input type="number" name="attr_ranged-damage-a" style="width: 50px" value="0" />
+            Target Difficulty <select name="attr_difficulty" style="width: 120px">
+                <option value="0">Same Rank</option>
+                <option value="-5">-5 Rank(Success)</option>
+                <option value="-4">-4 Rank(Success)</option>
+                <option value="-3">-3 Rank(Success)</option>
+                <option value="-2">-2 Rank(Success)</option>
+                <option value="-1">-1 Rank</option>
+                <option value="1">+1 Rank</option>
+                <option value="2">+2 Ranks</option>
+                <option value="3">+3 Ranks</option>
+                <option value="4">+4 Ranks</option>
+                <option value="5">+5 Ranks</option>
+                <option value="6">+6 Ranks</option>
+                <option value="7">+7 Ranks</option>
+            </select>
+            <br>
+            <button type="roll" name="attr_weapon-roll" value="&{template:ranged} {{name=@{character_name}'s}} {{attack=@{ranged-weapon-name} attack [[{@{ranged-weapon-rating}[rating]-@{total-IP}[penalties]-(@{difficulty})-1d10}]]}} {{a=[[@{ranged-damage-a}]]}}{{b=[[@{ranged-damage-b}]]}}{{c=[[@{ranged-damage-c}]]}}{{d=[[@{ranged-damage-d}]]}}">Roll Attack</button>
+            Notes <input type="text" style="width: 600px" name="attr_ranged-weapon-notes" />
+        </fieldset>
+    <br>
+    </div>
+        <textarea style="width: 100%" name="attr_weapon-table"></textarea>
     </div>
     <div class="sheet-log">
     Span log
@@ -957,7 +612,42 @@
         {{#rollBetween() eday 243 272}} September {{sep}}{{/rollBetween() eday 243 272}}
         {{#rollBetween() eday 273 303}} October {{oct}}{{/rollBetween() eday 273 303}}
         {{#rollBetween() eday 304 333}} November {{nov}}{{/rollBetween() eday 304 333}}
-        {{#rollBetween() eday 334 364}} December {{dec}}{{December}} {{/rollBetween() eday 334 364}}
+        {{#rollBetween() eday 334 364}} December {{dec}}{{/rollBetween() eday 334 364}}
         , h:m:s:{{ehour}}:{{eminute}}:{{esecond}}
         
 </rolltemplate>
+<rolltemplate class="sheet-rolltemplate-melee">
+    {{name}}<br>
+    {{attack}}<br>
+    {{#rollGreater() attack -1}} damage=
+    {{#rollTotal() attack 0}} {{0}} {{/rollTotal() attack 0}}
+    {{#rollTotal() attack 1}} {{1}} {{/rollTotal() attack 1}}
+    {{#rollTotal() attack 2}} {{2}} {{/rollTotal() attack 2}}
+    {{#rollTotal() attack 3}} {{3}} {{/rollTotal() attack 3}}
+    {{#rollTotal() attack 4}} {{4}} {{/rollTotal() attack 4}}
+    {{#rollTotal() attack 5}} {{5}} {{/rollTotal() attack 5}}
+    {{#rollTotal() attack 6}} {{6}} {{/rollTotal() attack 6}}
+    {{#rollTotal() attack 7}} {{7}} {{/rollTotal() attack 7}}
+    {{#rollTotal() attack 8}} {{8}} {{/rollTotal() attack 8}}
+    {{#rollTotal() attack 9}} {{9}} {{/rollTotal() attack 9}}
+    {{#rollTotal() attack 10}} {{10}} {{/rollTotal() attack 10}}
+    {{#rollTotal() attack 11}} {{11}} {{/rollTotal() attack 11}}
+    {{#rollTotal() attack 12}} {{12}} {{/rollTotal() attack 12}}
+    {{#rollTotal() attack 13}} {{13}} {{/rollTotal() attack 13}}
+    {{#rollTotal() attack 14}} {{14}} {{/rollTotal() attack 14}}
+    {{#rollTotal() attack 15}} {{15}} {{/rollTotal() attack 15}}
+    {{#rollTotal() attack 16}} {{16}} {{/rollTotal() attack 16}}
+    {{#rollTotal() attack 17}} {{17}} {{/rollTotal() attack 17}}
+    {{/rollGreater() attack -1}}
+</rolltemplate>
+
+<rolltemplate class="sheet-rolltemplate-ranged">
+    {{name}}<br>
+    {{attack}}<br>
+    {{#rollGreater() attack -1}} damage=
+        {{#rollBetween() attack 0 2}}{{d}} Location D{{/rollBetween() attack 0 2}}
+        {{#rollBetween() attack 3 4}}{{c}} Location C{{/rollBetween() attack 3 4}}
+        {{#rollBetween() attack 5 7}}{{b}} Location B{{/rollBetween() attack 5 7}}
+        {{#rollGreater() attack 7}}{{a}} Location A{{/rollGreater() attack 7}}
+    {{/rollGreater() attack -1}}
+</rolltemplate>