diff --git a/documents/caca_arch2.pdf b/documents/caca_arch2.pdf
new file mode 100644
index 000000000..dc9971875
Binary files /dev/null and b/documents/caca_arch2.pdf differ
diff --git a/handbook/troggle-ish.html b/handbook/troggle-ish.html
index 540d7dc8a..8fd1838eb 100644
--- a/handbook/troggle-ish.html
+++ b/handbook/troggle-ish.html
@@ -38,7 +38,7 @@ several languages (but mostly perl and python; we won't talk about the person wh
 <p>Examples of troggle-generated pages from data:
 <ul>
 <li><a href="http://expo.survex.com/caves">expo.survex.com/caves</a> - list of caves surveyed and links to guidebook descriptions
-<li>< href="http://expo.survex.com/pubs.htm">http://expo.survex.com/pubs.htm</a> -  reports, accounts and logbooks
+<li><a href="http://expo.survex.com/pubs.htm">http://expo.survex.com/pubs.htm</a> -  reports, accounts and logbooks
 <li><a href="http://expo.survex.com/expedition/2018">expo.survex.com/expedition/2018</a> - Members on expo 2018: . Scroll down for a list of all the data typed in from survey trips.
 <li><a href="http://expo.survex.com/survexfile/caves/">expo.survex.com/survexfile/caves/</a> - List of caves with all the surveys done for each.
 <li><a href="http://expo.survex.com/survexfile/caves-1623/115/cucc/futility.svx">expo.survex.com/survexfile/caves-1623/115/cucc/futility.svx</a> - Cave survey data from 1983 in Schnellzughohle. 
@@ -74,7 +74,7 @@ how to use it</a> and <em>how to tidy up afterwards</em>.
 All Survex | Scans | Tunneldata | 107 | 161 | 204 | 258 | 264 | Expo2016 | Expo2017 | Expo2018 | Django admin 
 </pre>
 
-<h3>Preamble</h3>
+<h3>Future Developments: Preamble</h3>
 <p><em>Assumptions</em> (points to necessarily agree upon)
 <ol>
 <li>Let's NOT try to design a generic catalogue for storing all kind of data about caves of the whole world, intended for every kind of user (sports, exploration, science). Let's just settle for a generic framework. Let geeks in individual countries or individual communities write their tools operating within this framework.
@@ -85,6 +85,8 @@ All Survex | Scans | Tunneldata | 107 | 161 | 204 | 258 | 264 | Expo2016 | Expo2
 <li>Let's support i18n - let's use UTF-8 everywhere and cater for data in many languages(entrance names, cave descriptions, location descriptions etc.)
 </ol>
 
+<p>Two page preliminary design document for <a href="/documents/caca_arch2.pdf">'caca' (Cave Catalogue) rev.2 2013-07-26</a> by Wookey (copied from http://wookware.org/software/cavearchive/caca_arch2.pdf)
+
 <h3>stroggle</h3>
 <p>At one time Martin Green attempted to reimplement troggle as "stroggle" using <a href="https://www.fullstackpython.com/flask.html">flask</a> instead of Django at 
 <a href="https://en.wikipedia.org/wiki/Gitorious">git@gitorious.org:stroggle/stroggle.git</a> (but gitorious has been deleted).</p>
@@ -96,9 +98,9 @@ All Survex | Scans | Tunneldata | 107 | 161 | 204 | 258 | 264 | Expo2016 | Expo2
 
 <h3>CUCC wiki on troggle</h3>
 
-<p>CUCC still has a list of things that at one time were live tasks, reproduced here:
+<p>CUCC still has an archive list of things that at one time were live tasks, reproduced here:
 from <a href="http://caving.soc.srcf.net/wiki/Troggle">caving.soc.srcf.net/wiki/Troggle</a>
-<p>Troggle is a system under development for keeping track of all expo data in a logical and accessible way, and displaying it on the web. At the moment, it is under development at <a rel="nofollow" class="external free" href="http://troggle.cavingexpedition.com/">http://troggle.cavingexpedition.com/</a> 
+<p>Troggle is a system under development for keeping track of all expo data in a logical and accessible way, and displaying it on the web. At the moment, it is [no longer] under development at<u>http://troggle.cavingexpedition.com/</u>
 
 <tt>But note that this is Aaron's version of troggle, forked from the version of troggle we use. Aaron uses this for the <a href="https://expeditionwriter.com/new-expedition-to-mount-erebus-antarctica/">Erebus expedition</a>.</tt>
 </p>
@@ -115,19 +117,19 @@ from <a href="http://caving.soc.srcf.net/wiki/Troggle">caving.soc.srcf.net/wiki/
  <td><p>Logbook</p></td>
  <td><p>Yes; manually formatted each year</p></td>
  <td><p>Yes; wiki-style</p></td>
- <td><p>Start at the front page, <a rel="nofollow" class="external autonumber" href="http://troggle.cavingexpedition.com/">[1]</a> and click to logbook for year. The logbooks have been parsed back to 1997. </p></td>
+ <td><p>Start at the front page, <a rel="nofollow" class="external autonumber" href="http://expo.survex.com/expedition/2007">troggle.cavingexpedition.com/ [1]</a> and click to logbook for year. The logbooks have been parsed back to 1997. </p></td>
  </tr>
  <tr>
  <td><p>Cave index and stats generated from survex file</p></td>
  <td><p>Yes</p></td>
  <td><p>Yes</p></td>
- <td><p>Done; see <a rel="nofollow" class="external autonumber" href="http://troggle.cavingexpedition.com//cave">[2]</a> </p></td>
+ <td><p>Done; see <a rel="nofollow" class="external autonumber" href="http://expo.survex.com/survexfile/caves/264">troggle.cavingexpedition.com/survey/caves/264 [2]</a> </p></td>
  </tr>
  <tr>
  <td><p>Survey workflow helper</p></td>
  <td><p>Yes; minimal. surveys.csv produced an html table of whose surveys were not marked “finished”</p></td>
  <td><p>Yes. Makes table of surveys per expo which shows exactly what needs doing. Displays scans. Integrated with survex, scanner software, and tunnel.</p></td>
- <td><p>See it at <a rel="nofollow" class="external free" href="http://troggle.cavingexpedition.com/survey">http://troggle.cavingexpedition.com/survey</a> . Be sure to try a recent year when we should have data. Survex, scanner, and tunnel integration still needs doing.</p></td>
+ <td><p>See it at <a rel="nofollow" class="external free" href="http://expo.survex.com/survey_scans/">troggle.cavingexpedition.com/survey</a> . Be sure to try a recent year when we should have data. Survex, scanner, and tunnel integration still needs doing.</p></td>
  </tr>
  <tr>
  <td><p>QM lists generated automatically</p></td>
@@ -139,13 +141,13 @@ from <a href="http://caving.soc.srcf.net/wiki/Troggle">caving.soc.srcf.net/wiki/
  <td><p>Automatic calendar for each year of who will be on expo when</p></td>
  <td><p>No, manually produced some years</p></td>
  <td><p>Yes</p></td>
- <td><p>Done; see <a rel="nofollow" class="external free" href="http://troggle.cavingexpedition.com/calendar/2007">http://troggle.cavingexpedition.com/calendar/2007</a> (replace 2007 with year in question)</p></td>
+ <td><p>Done; see <a rel="nofollow" class="external free" href="http://expo.survex.com/expedition/2007">troggle.cavingexpedition.com/calendar/2007</a> (replace 2007 with year in question)</p></td>
  </tr>
  <tr>
  <td><p>Web browser used to enter data</p></td>
  <td><p>No</p></td>
  <td><p>Yes</p></td>
- <td><p>Everything can be edited through admin, at <a rel="nofollow" class="external free" href="http://troggle.cavingexpedition.com/admin">http://troggle.cavingexpedition.com/admin</a> . Ask aaron, martin, or julian for the password if you want to have a look / play around with the admin site. Any changes you make will be overwritten. Eventually, data entry will probably be done using custom forms.
+ <td><p>Everything can be edited through admin, at <a rel="nofollow" class="external free" href="http://expo.survex.com/admin/">troggle.cavingexpedition.com/admin</a> . Ask aaron, martin, or julian for the password if you want to have a look / play around with the admin site. Any changes you make will be overwritten. Eventually, data entry will probably be done using custom forms.
  </p></td>
  </tr>
  <tr>
@@ -247,7 +249,7 @@ works, we try to convince others to use it and maybe push it through UIS.
 </pre>
 
 <h3>Wookey's other notes on things to do</h3>
-from <a href="ttp://wookware.org/software/cavearchive/troggle2design">wookware.org/software/cavearchive/troggle2design</a>
+from <a href="http://wookware.org/software/cavearchive/troggle2design">wookware.org/software/cavearchive/troggle2design</a>
 <pre>
 forms
 -----