diff --git a/cave_data/1626-2018-pw-02.html b/cave_data/1626-2018-pw-02.html
new file mode 100644
index 000000000..3893ab8e4
--- /dev/null
+++ b/cave_data/1626-2018-pw-02.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<!-- This file is generated by troggle on Sept. 26, 2023, 6:06 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- Only put one cave in this file -->
+<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+make sure you update the database by doing a full data import. If you edit it using the online form
+though, you do not need to do a data import as it happens automatically -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body>
+<b>This file is generated by troggle</b> on Sept. 26, 2023, 6:06 p.m. UTC using the form documented at
+the form documented at 
+<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
+<br>
+
+<cave>
+<non_public>False</non_public><!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. -->
+<caveslug>1626-2018-pw-02</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<official_name></official_name><!-- Name of the cave (normally in German)  Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
+<area>1626</area><!-- e.g. "1623" -->
+<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
+code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+
+    T   Trockenh&ouml;hlen (Dry caves)
+    W   Wasserh&ouml;hlen (Caves with water)
+   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
+    E   Eishohlen (Caves with ice formations)
+    S   Schachth&ouml;hlen (Caves with pitches)
+    H   Halbh&ouml;hlen (Rock shelters ?)
+
+    -   unerforscht (unexplored)
+    =   befahren (visited)
+    ×   teilweise vermessen (partly surveyed)
+    +   erforscht (exploration considered complete)
+ -->
+<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
+<unofficial_number>2018-pw-02</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+
+<entrance>
+  <entranceslug>1626-2018-pw-02</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
+  <!-- DEBUG  1626-2018-PW-02+1626-2018-PW-02 'Z' == -->
+  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+</entrance>
+
+<explorers>Discovered 2018 Phil W and Typhon</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
+<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
+<underground_description>2x1m shaft with 3s drop when rocks bounced off E wall. Shaft is at S end of a 30x40m depression with cliff tiers on N side. Photos on Philip's camera GPS. Waypoint on Philip's phone.
+
+Shaft is just N of a 10x5m knobble of bunde.
+
+<img src="/years/2018/logbook20.jpg" width=40%>
+
+{ We came back on 2018-07-25 with Frank Tully and dropped this.See next page for updated notes and elevation. It craps out. Cave left untagged. Waypoint in prospecting GPX file. }</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
+<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
+<references>2018#17 - scanned diagrams and notes</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
+<survey>sketches in <a href="/logbookentry/2018-07-24/2018-07-24b">Logbook 2018-07-24b</a>
+and survey sketch in
+<a href="/logbookentry/2018-07-25/2018-07-25a">2018-07-25a</a></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
+<kataster_status></kataster_status>
+<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
+<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
+<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
+<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<extent></extent>
+
+<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
+<url>1626/2018-pw-02.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+</cave>
+</body>
+</html>
diff --git a/cave_data/1626-2018-pw-03.html b/cave_data/1626-2018-pw-03.html
new file mode 100644
index 000000000..be96c3db6
--- /dev/null
+++ b/cave_data/1626-2018-pw-03.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<!-- This file is generated by troggle on Sept. 26, 2023, 6:40 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- Only put one cave in this file -->
+<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+make sure you update the database by doing a full data import. If you edit it using the online form
+though, you do not need to do a data import as it happens automatically -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body>
+<b>This file is generated by troggle</b> on Sept. 26, 2023, 6:40 p.m. UTC using the form documented at
+the form documented at 
+<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
+<br>
+
+<cave>
+<non_public>False</non_public><!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. -->
+<caveslug>1626-2018-pw-03</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<official_name>VMKBAH höhle</official_name><!-- Name of the cave (normally in German)  Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
+<area>1626</area><!-- e.g. "1623" -->
+<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
+code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+
+    T   Trockenh&ouml;hlen (Dry caves)
+    W   Wasserh&ouml;hlen (Caves with water)
+   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
+    E   Eishohlen (Caves with ice formations)
+    S   Schachth&ouml;hlen (Caves with pitches)
+    H   Halbh&ouml;hlen (Rock shelters ?)
+
+    -   unerforscht (unexplored)
+    =   befahren (visited)
+    ×   teilweise vermessen (partly surveyed)
+    +   erforscht (exploration considered complete)
+ -->
+<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
+<unofficial_number>2018-pw-03</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+
+<entrance>
+  <entranceslug>1626-2018-pw-03</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
+  <!-- DEBUG  1626-2018-pw-03+1626-2018-pw-03 'Z' == -->
+  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+</entrance>
+
+<explorers>Discovered 2018 Phil W and Typhon</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
+<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
+<underground_description>10m horizontal rift. dripping with 90° 'L'-bend 7m in, then dead end after a further 2.5m. Stoopy loose ceiling. 
+<img src="/years/2018/logbook19.jpg">
+<p>Photos on Philips camera. GPS on Philip's phone.. Waypoint in prospecting GPX file. Photos uploaded to expofiles/photos/PhilipWithnall.</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
+<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
+<references>2018#17 - scanned diagrams and notes</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
+<survey>sketches in <a href="/logbookentry/2018-07-24/2018-07-24b">Logbook 2018-07-24b</a></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
+<kataster_status></kataster_status>
+<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
+<notes>{ After discussion with Elaine, the german name for this cave is Verliessmeinenkompassbeideranderenhöhle (VMKBAH) höhle. Note the duplicated höhle is necessary. Waypoint in prospecting GPX file. Photos uploaded to expofiles/photos/PhilipWithnall. }</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
+<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
+<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<extent></extent>
+
+<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
+<url>1626/2018-pw-03.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+</cave>
+</body>
+</html>
diff --git a/cave_data/pendingcaves.txt b/cave_data/pendingcaves.txt
index efe860e16..533594c40 100644
--- a/cave_data/pendingcaves.txt
+++ b/cave_data/pendingcaves.txt
@@ -11,6 +11,4 @@
 1623-2017-dm-01
 1623-2019-rh-01
 1623-2023-WW-01
-1626-BuzzardHole
-1626-2018-pw-03
-1626-2018-pw-02
\ No newline at end of file
+1626-BuzzardHole
\ No newline at end of file
diff --git a/entrance_data/1626-2018-pw-02.html b/entrance_data/1626-2018-pw-02.html
new file mode 100644
index 000000000..b0fdee4f0
--- /dev/null
+++ b/entrance_data/1626-2018-pw-02.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<!-- Only put one entrance in this file -->
+<!-- This file is generated by troggle on Sept. 26, 2023, 6:06 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- If you edit this file by hand, and manually upload it to the server using git,
+make sure you update the database by doing a full data import. If you edit it using the online form
+though, you do not need to do a data import as it happens automatically -->
+
+    <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
+    <!-- there is 1 required field: slug. The entrance will not appear without that. -->
+    <!-- ALWAYS use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
+
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body>
+<b>This file is generated by troggle</b> on Sept. 26, 2023, 6:06 p.m. UTC using the form documented at 
+<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
+<br>
+<entrance>
+<non_public>False</non_public>
+<slug>1626-2018-pw-02</slug> <!-- one entrance and one slug per entrance_data file -->
+<name></name>
+<entrance_description>Shaft is at S end of a 30x40m depression with cliff tiers on N side. Photos on Philip's camera GPS. Waypoint on Philip's phone.
+
+Shaft is just N of a 10x5m knobble of bunde.</entrance_description>
+<explorers></explorers>
+<map_description></map_description>
+<location_description></location_description>
+<lastvisit>2018-07-25</lastvisit>
+<approach></approach>
+<underground_description></underground_description>
+<photo></photo>
+<!-- marking options: P  = Paint,
+                      P? = Paint (?),
+                      T  = Tag,
+                      T? = Tag (?),
+                      R  = Retagged,
+                      S  = Spit,
+                      S? = Spit (?),
+                      U  = Unmarked,
+                      ?  = Unknown" -->
+<marking>U</marking> 
+<marking_comment></marking_comment>
+<!-- findability options: ? = To be confirmed ...,
+                          S = Surveyed,
+                          L = Lost,
+                          R = Refindable" -->
+<findability>S</findability>
+<findability_description></findability_description>
+<alt></alt>
+<northing></northing>
+<easting></easting> 
+<tag_station></tag_station>
+<exact_station></exact_station>
+<other_station></other_station>
+<other_description></other_description>
+<bearings></bearings>
+<url></url>
+</entrance>
+</body>
+</html>
diff --git a/entrance_data/1626-2018-pw-03.html b/entrance_data/1626-2018-pw-03.html
new file mode 100644
index 000000000..471f9ed0d
--- /dev/null
+++ b/entrance_data/1626-2018-pw-03.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<!-- Only put one entrance in this file -->
+<!-- This file is generated by troggle on Sept. 26, 2023, 5:56 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- If you edit this file by hand, and manually upload it to the server using git,
+make sure you update the database by doing a full data import. If you edit it using the online form
+though, you do not need to do a data import as it happens automatically -->
+
+    <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
+    <!-- there is 1 required field: slug. The entrance will not appear without that. -->
+    <!-- ALWAYS use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
+
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body>
+<b>This file is generated by troggle</b> on Sept. 26, 2023, 5:56 p.m. UTC using the form documented at 
+<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
+<br>
+<entrance>
+<non_public>False</non_public>
+<slug>1626-2018-pw-03</slug> <!-- one entrance and one slug per entrance_data file -->
+<name></name>
+<entrance_description>Entrance in the East wall of a large depression (which has 2018-th-02 at its south end), roughly 10m deep. 100m N-S, 10-30m E-W.</entrance_description>
+<explorers></explorers>
+<map_description></map_description>
+<location_description></location_description>
+<lastvisit></lastvisit>
+<approach></approach>
+<underground_description></underground_description>
+<photo></photo>
+<!-- marking options: P  = Paint,
+                      P? = Paint (?),
+                      T  = Tag,
+                      T? = Tag (?),
+                      R  = Retagged,
+                      S  = Spit,
+                      S? = Spit (?),
+                      U  = Unmarked,
+                      ?  = Unknown" -->
+<marking>?</marking> 
+<marking_comment></marking_comment>
+<!-- findability options: ? = To be confirmed ...,
+                          S = Surveyed,
+                          L = Lost,
+                          R = Refindable" -->
+<findability>R</findability>
+<findability_description></findability_description>
+<alt></alt>
+<northing></northing>
+<easting></easting> 
+<tag_station></tag_station>
+<exact_station></exact_station>
+<other_station></other_station>
+<other_description></other_description>
+<bearings></bearings>
+<url></url>
+</entrance>
+</body>
+</html>
