diff --git a/handbook/survey/index.htm b/handbook/survey/index.htm
index d0548aa99..c1441a9b8 100644
--- a/handbook/survey/index.htm
+++ b/handbook/survey/index.htm
@@ -43,7 +43,7 @@ detailed topics.</p>
<li><a href="../logbooks.html">Expo logbooks</a> - how and why
<li><a href="newcave.html">The complete process for recording cave data</a></li>
<li><a href="/katast.htm">The Austrian Kataster areas</a></li>
- <li>Current Expo survey <a href="/expofiles/surveyscans/2022/walletindex.html">wallet status</a>.</li>
+ <li>Current Expo survey <a href="/wallets/year/2022">wallet status</a>.</li>
<li>Current Expo survey data <a href="../computing/todo-data.html">TO-DO list</a>.</li>
</ul>
</li>
diff --git a/handbook/survey/onlinewallet.html b/handbook/survey/onlinewallet.html
index 7023365e4..b3224c47a 100644
--- a/handbook/survey/onlinewallet.html
+++ b/handbook/survey/onlinewallet.html
@@ -287,23 +287,6 @@ the blank template produced by the wallets.py
# Update March 2019
-a consolidated to-do list of the last 3 years on the server:
-http://expo.survex.com/expofiles/surveyscans/2016-18/walletindex.html
-This is a hand-done kludge and only the first level of links works - which is to the individual person's page.
-
-the lists for the last 3 years individually and all the links are working for each wallet page:
-both local links to your PC and to the right location of the .svx files on the troggle server.
-http://expo.survex.com/expofiles/surveyscans/2016/walletindex.html
-http://expo.survex.com/expofiles/surveyscans/2017/walletindex.html
-http://expo.survex.com/expofiles/surveyscans/2018/walletindex.html
-and all the names of people have been hand-edited in the .json files to be consistent and identical.
-
-2015 has now been done stand-alone but there is no consolidated report for 2015-18 yet.
-The big task was editing everyone's names to be exactly the same version of the name as used in other years.
-
-
-
-
For 2014 and earlier one needs to do a lot more data entry. The contents.json files for 2014 and earlier do not say who the
people were on the trip. So we would need to work from the svx files (where they contain the *ref: wallet ID),
original plastic wallets (and the scanned drawings and notes - which are incomplete) to enter that data.
diff --git a/handbook/survey/status.html b/handbook/survey/status.html
index 543edfd88..6e67511a8 100644
--- a/handbook/survey/status.html
+++ b/handbook/survey/status.html
@@ -14,15 +14,17 @@
<p>There are two separate online systems to help you do this.
<p><b>First</b>, you look online at or for the current year: (2018 in this example)<br />
-<a href="http://expo.survex.com/expofiles/surveyscans/2018/walletindex.html"><b>/expofiles/surveyscans/2018/</b></a>
+<a href="http://expo.survex.com/wallets/year/2019"><b>/wallets/year/2019/</b></a>
<br />
-(you can substitute any year after 2015 instead of 2018 in that example).
+(you can substitute any year instead of 2019 in that example).
<br />
<p><b>Second</b>, look at the online troggle-generated table of logbook entries and survey trips<br />
<a href="http://expo.survex.com/expedition/2018"><b>/expedition/2018/</b></a>
<br />
-(You need to scroll down past the table of attendees). This expedition report only shows those cave surveys which have been both typed up and entered into the online system, and also only those logbook entries which have been typed up already. So it will not be as up to date as the first method.
+(You need to scroll down past the table of attendees). This expedition report only shows those cave surveys which have
+been both typed up and entered into the online system, and also only those logbook entries which have been typed up already.
+So it will not be as up to date as the first method.
<p>The most up to date method is to look in the lever-arch file containing the plastic survey wallets which is kept in the potato hut during expo.
<p>The online wallet system and how it works are <a href="newcave.html#onlinew">well documented in the survey handbook</a>.
diff --git a/handbook/troggle/troglaptop.html b/handbook/troggle/troglaptop.html
index 01637fb30..6016f79fe 100644
--- a/handbook/troggle/troglaptop.html
+++ b/handbook/troggle/troglaptop.html
@@ -396,7 +396,7 @@ will need to clean up.
<br>- <var><a href="http://localhost:8000/pathsreport">http://localhost:8000/pathsreport</a></var>
<br>- <var><a href="http://localhost:8000/stats">http://localhost:8000/stats</a></var>
<br>- <var><a href="http://localhost:8000/people">http://localhost:8000/people</a></var> (takes a minute or so)
-<br>- <var><a href="http://localhost:8000/expofiles/surveyscans/2019/walletindex.html">http://localhost:8000/expofiles/surveyscans/2019/walletindex.html</a></var>
+<br>- <var><a href="http://localhost:8000/wallets/year/2019">http://localhost:8000/wallets/year/2019l</a></var>
<br>- <var><a href="http://localhost:8000/survexfile/caves/">http://localhost:8000/survexfile/caves/</a></var>
<br>- <var><a href="http://localhost:8000/expofiles/training-info/Idiots guide to accessing expo git.pptx">http://localhost:8000/expofiles/training-info/Idiots guide to accessing expo git.pptx</a></var>
<br>- <var><a href="http://localhost:8000/1623/291/291">http://localhost:8000/1623/291/291</a></var>
diff --git a/handbook/troggle/trogreports.html b/handbook/troggle/trogreports.html
index e328fcfef..705add1a3 100644
--- a/handbook/troggle/trogreports.html
+++ b/handbook/troggle/trogreports.html
@@ -39,7 +39,7 @@ date on expo, or on how a specific exploration trip's survey numbers have been p
<h3>All about one Expo on one year</h3>
<a href="/expedition/2019">expo</a> - who, where, when, what<br>
<a href="/years/2018/index.html">expo planning</a> - planning and results (not a troggle report)<br>
-<a href="/expofiles/surveyscans/2018/walletindex.html">wallet status</a> - progress of wallets for one year <a href="/handbook/troggle/scriptscurrent.html#wallets">(external script)</a><br>
+<a href="/wallets/year/2019">2019 wallet status</a> - progress of wallets for one year<br>
<h3>All about survex cave data files</h3>
@@ -59,9 +59,11 @@ date on expo, or on how a specific exploration trip's survey numbers have been p
<a href="/survey_scans/">survey scan wallets</a> - all the <a href="/handbook/survey/newwallet.html">wallets</a> and the survex data blocks associated with that survey trip<br>
<a href="/dwgfiles/">dwgfiles</a> - all the tunnel & therion drawings, wallets and scanned images<br>
<a href="/expedition/2019">expo</a> - all wallets on a specific expo<br>
-<a href="/expofiles/surveyscans/2018/walletindex.html">wallet status</a> - progress of <a href="/handbook/survey/newwallet.html">wallets</a> for one year <a href="/handbook/troggle/scriptscurrent.html#wallets">(external script)</a><br>
-<a href="/expofiles/surveyscans/2018/Becka%20Lawson.html">outstanding wallet jobs for one person</a> - <a href="/handbook/troggle/scriptscurrent.html#wallets">(external script)</a><br>
-<a href="/expofiles/surveyscans/2018/2018%2316/walletindex.html">outstanding wallet jobs for one wallet</a> - <a href="/handbook/troggle/scriptscurrent.html#wallets">(external script)</a><br>
+<a href="/wallets/year/2019">wallet status</a> - progress of <a href="/handbook/survey/newwallet.html">wallets</a> for one year <br>
+<a href="/wallets/person/MichaelSargent">outstanding wallet jobs for one person</a> ><br>
+<a href="/cave/scans/1623-290">outstanding wallet jobs for one cave</a> ><br>
+
+<a href="/survey_scans/2019:17/">outstanding wallet jobs for one wallet - shown on every wallet</a> <br>
<h3>Data about all expos</h3>
<a href="/folk/">members and guests</a> - who came and how many expos<br>
diff --git a/years/2018/index.html b/years/2018/index.html
index 63d8de963..676d10f6a 100755
--- a/years/2018/index.html
+++ b/years/2018/index.html
@@ -25,7 +25,7 @@ Link to last year: <a href="../2017/">2017</a>
<ul>
<li><a href="logbook.html">2018 Logbook</a></li>
<li><a href="../../../expofiles/writeups/2018/calloutbook/">2018 call-out book</a></li>
-<li><a href="../../../expofiles/surveyscans/2018/walletindex.html">Progress list of 2018 surveying</a></li>
+<li><a href="/wallets/year/2018">Progress list of 2018 surveying</a></li>
</ul>
<h3>Post-Expo Completion</h3>
<ul>
diff --git a/years/2019/index.html b/years/2019/index.html
index 67f652aba..3d9324791 100755
--- a/years/2019/index.html
+++ b/years/2019/index.html
@@ -19,7 +19,7 @@ Link to last year: <a href="../2018/index.html">2018</a>
</ul>
On expo website:
<ul>
-<li><a href="../../../expofiles/surveyscans/2018/walletindex.html">2018 surveying progress</a></li>
+<li><a href="/wallets/year/2018">2018 surveying progress</a></li>
<li><a href="../2018/topcamplist.html">Stuff left at top camp 2018</a></li>
<li><a href="../2018/basecamplist.html">Stuff left at base camp 2018</a></li>
<li><a href="../2018/ugcamplist.html">Stuff left at Littleboy camp 2018</a></li>
@@ -41,7 +41,7 @@ On expo website:
<h3>During Expo data entry</h3>
<ul>
-<li><a href="../../../expofiles/surveyscans/2019/walletindex.html">2019 surveying progress</a></li>
+<li><a href="/wallets/year/2019">2019 surveying progress</a></li>
<li><a href="https://ukcaving.com/board/index.php?topic=25249">During-Expo Blog</a> on ukcaving.com
<li>Photos of Call-out book every week(backup)
<li>Photos of bier book every week - bier and expenses (backup)