diff --git a/env/dev/resources/config.edn b/env/dev/resources/config.edn
index 6f14c22..c261b18 100644
--- a/env/dev/resources/config.edn
+++ b/env/dev/resources/config.edn
@@ -1,4 +1,6 @@
 {:dev true
  :port 3000
  ;; when :nrepl-port is set the application starts the nREPL server on load
- :nrepl-port 7000}
+ :nrepl-port 7000
+ :site-title "Project Hope"
+ :site-logo "img/ProjectHopeLogo.png"}
diff --git a/project.clj b/project.clj
index 404b692..5e77ef4 100644
--- a/project.clj
+++ b/project.clj
@@ -24,6 +24,7 @@
                  [mount "0.1.11"]
                  [org.clojure/clojure "1.8.0"]
                  [org.clojure/clojurescript "1.9.229" :scope "provided"]
+                 [org.clojure/core.memoize "0.7.1"]
                  [org.clojure/tools.cli "0.3.5"]
                  [org.clojure/tools.logging "0.3.1"]
                  [org.postgresql/postgresql "9.4.1212"]
diff --git a/resources/public/css/yyy-common.css b/resources/public/css/yyy-common.css
index 074e9bd..75275ff 100644
--- a/resources/public/css/yyy-common.css
+++ b/resources/public/css/yyy-common.css
@@ -78,6 +78,7 @@ header {
   margin-top: 0;
   width:100%;
   max-width: 100%;
+  min-height: 96px; /* yes, we don't approve of pixel values; but this is to ensure the logo fits. */
   background-color: rgb(7, 57, 106);
   color: white;
 }
@@ -238,6 +239,11 @@ th {
 	border-bottom: thin solid white;
 }
 
+#site-logo {
+  padding: 0.5em;
+  float: left;
+}
+
 /* but magically appears on mouseover */
 #cookies:hover #more-about-cookies {
 	display: block;
diff --git a/resources/public/img/ProjectHopeLogo.png b/resources/public/img/ProjectHopeLogo.png
new file mode 100644
index 0000000..2c2b00f
Binary files /dev/null and b/resources/public/img/ProjectHopeLogo.png differ
diff --git a/resources/sql/queries.auto.sql b/resources/sql/queries.auto.sql
index d9a0e45..e08aa23 100644
--- a/resources/sql/queries.auto.sql
+++ b/resources/sql/queries.auto.sql
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------
 --	File queries.sql 
 --	
---	autogenerated by adl.to-hugsql-queries at 2018-06-29T22:21:53.869Z 
+--	autogenerated by adl.to-hugsql-queries at 2018-06-30T11:35:59.388Z 
 --	
 --	See [Application Description 
 --	Language](https://github.com/simon-brooke/adl). 
@@ -282,6 +282,8 @@ SELECT * FROM canvassers
 WHERE canvassers.id = :id
 ORDER BY canvassers.username,
 	canvassers.fullname,
+	canvassers.address_id,
+	canvassers.phone,
 	canvassers.email,
 	canvassers.id
 
@@ -291,6 +293,8 @@ SELECT * FROM canvassers
 WHERE canvassers.username = :username
 ORDER BY canvassers.username,
 	canvassers.fullname,
+	canvassers.address_id,
+	canvassers.phone,
 	canvassers.email,
 	canvassers.id
 
@@ -420,6 +424,8 @@ SELECT DISTINCT * FROM lv_authorities
 SELECT DISTINCT * FROM lv_canvassers
 ORDER BY lv_canvassers.username,
 	lv_canvassers.fullname,
+	lv_canvassers.address_id,
+	lv_canvassers.phone,
 	lv_canvassers.email,
 	lv_canvassers.id
 --~ (if (:offset params) "OFFSET :offset ")
@@ -433,6 +439,8 @@ WHERE lv_canvassers.id = canvassers.id
 	AND canvassers.address_id = :id
 ORDER BY lv_canvassers.username,
 	lv_canvassers.fullname,
+	lv_canvassers.address_id,
+	lv_canvassers.phone,
 	lv_canvassers.email,
 	lv_canvassers.id
 
@@ -444,6 +452,8 @@ WHERE lv_canvassers.id = canvassers.id
 	AND canvassers.authority_id = :id
 ORDER BY lv_canvassers.username,
 	lv_canvassers.fullname,
+	lv_canvassers.address_id,
+	lv_canvassers.phone,
 	lv_canvassers.email,
 	lv_canvassers.id
 
@@ -455,6 +465,8 @@ WHERE lv_canvassers.id = canvassers.id
 	AND canvassers.elector_id = :id
 ORDER BY lv_canvassers.username,
 	lv_canvassers.fullname,
+	lv_canvassers.address_id,
+	lv_canvassers.phone,
 	lv_canvassers.email,
 	lv_canvassers.id
 
@@ -466,6 +478,8 @@ WHERE canvassers.id = ln_canvassers_roles.canvasser_id
 	AND ln_canvassers_roles.role_id = :id
 ORDER BY canvassers.username,
 	canvassers.fullname,
+	canvassers.address_id,
+	canvassers.phone,
 	canvassers.email,
 	canvassers.id
 
@@ -783,6 +797,8 @@ WHERE false
 	--~ (if (:id params) "OR id = :id")
 ORDER BY lv_canvassers.username,
 	lv_canvassers.fullname,
+	lv_canvassers.address_id,
+	lv_canvassers.phone,
 	lv_canvassers.email,
 	lv_canvassers.id
 --~ (if (:offset params) "OFFSET :offset ")
diff --git a/resources/sql/youyesyet.postgres.sql b/resources/sql/youyesyet.postgres.sql
index 42b0f83..e787f6f 100644
--- a/resources/sql/youyesyet.postgres.sql
+++ b/resources/sql/youyesyet.postgres.sql
@@ -5,7 +5,7 @@
 --	
 --	auto-generated by [Application Description Language framework] 
 --	
---	(https://github.com/simon-brooke/adl) at 20180629T163619.639Z 
+--	(https://github.com/simon-brooke/adl) at 20180630T113600.308Z 
 --	
 --	
 --	    A web-app intended to be used by canvassers campaigning for a 
@@ -576,7 +576,7 @@ GRANT SELECT ON lv_electors TO admin,
 CREATE VIEW lv_followupactions AS
 SELECT electors.name ||', '|| electors.phone ||', '|| electors.email ||', '|| genders.id ||', '|| addresses.address ||', '|| addresses.postcode ||', '|| visits.date ||', '|| issues.id AS request_id_expanded,
 	followupactions.request_id,
-	canvassers.username ||', '|| canvassers.fullname ||', '|| canvassers.email AS actor_expanded,
+	canvassers.username ||', '|| canvassers.fullname ||', '|| addresses.address ||', '|| addresses.postcode ||', '|| canvassers.phone ||', '|| canvassers.email AS actor_expanded,
 	followupactions.actor,
 	followupactions.date,
 	followupactions.notes,
@@ -741,7 +741,7 @@ GRANT SELECT ON lv_teams TO admin,
 CREATE VIEW lv_visits AS
 SELECT addresses.address ||', '|| addresses.postcode AS address_id_expanded,
 	visits.address_id,
-	canvassers.username ||', '|| canvassers.fullname ||', '|| canvassers.email AS canvasser_id_expanded,
+	canvassers.username ||', '|| canvassers.fullname ||', '|| addresses.address ||', '|| addresses.postcode ||', '|| canvassers.phone ||', '|| canvassers.email AS canvasser_id_expanded,
 	visits.canvasser_id,
 	visits.date,
 	visits.id
diff --git a/resources/templates/about.html b/resources/templates/about.html
new file mode 100644
index 0000000..97ccd2d
--- /dev/null
+++ b/resources/templates/about.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+{% block big-links %}
+{% endblock %}
+{% block content %}
+<h2>
+  Alpha test code
+</h2>
+<p>
+  Although addresses in the database mostly are real, all personal data in the database
+  is randomly generated and does not represent real people.
+</p>
+{% endblock %}
+
diff --git a/resources/templates/app.html b/resources/templates/app.html
index 024aa39..6b7bccb 100644
--- a/resources/templates/app.html
+++ b/resources/templates/app.html
@@ -1,4 +1,4 @@
-{% extends "base-authenticated.html" %}
+{% extends "base.html" %}
 {% block whole-page %}
     <div id="app">
       <div class="splash-screen">
@@ -23,13 +23,13 @@
       </p>
     </div>
 {% endblock %}
-{% block extra-script %}
+{% block extra-tail %}
 <!-- scripts and styles -->
 <!-- ATTENTION \/ -->
+<!-- ATTENTION /\ -->
 <!-- Leaflet -->
 <link rel="stylesheet" href="vendor/leaflet/dist/leaflet.css" />
 <script src="vendor/leaflet/dist/leaflet.js"></script>
-<!-- ATTENTION /\ -->
 {% script "/js/app.js" %}
 {% endblock %}
 
diff --git a/resources/templates/auto/application-index.html b/resources/templates/auto/application-index.html
index db28ab2..c379eea 100644
--- a/resources/templates/auto/application-index.html
+++ b/resources/templates/auto/application-index.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File application-index.html generated 2018-06-29T22:21:55.471Z by adl.to-selmer-templates.
+<!-- File application-index.html generated 2018-06-30T11:36:00.890Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-addresses-Address.html b/resources/templates/auto/form-addresses-Address.html
index 083db4f..ee7c8ba 100644
--- a/resources/templates/auto/form-addresses-Address.html
+++ b/resources/templates/auto/form-addresses-Address.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-addresses-Address.html generated 2018-06-29T16:36:20.128Z by adl.to-selmer-templates.
+<!-- File form-addresses-Address.html generated 2018-06-30T11:36:00.879Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-authorities-Authority.html b/resources/templates/auto/form-authorities-Authority.html
index 19283c2..fa47abe 100644
--- a/resources/templates/auto/form-authorities-Authority.html
+++ b/resources/templates/auto/form-authorities-Authority.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-authorities-Authority.html generated 2018-06-29T16:36:20.148Z by adl.to-selmer-templates.
+<!-- File form-authorities-Authority.html generated 2018-06-30T11:36:00.898Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-canvassers-Canvasser.html b/resources/templates/auto/form-canvassers-Canvasser.html
index ef82c02..ba56e4a 100644
--- a/resources/templates/auto/form-canvassers-Canvasser.html
+++ b/resources/templates/auto/form-canvassers-Canvasser.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-canvassers-Canvasser.html generated 2018-06-29T16:36:20.151Z by adl.to-selmer-templates.
+<!-- File form-canvassers-Canvasser.html generated 2018-06-30T11:36:00.901Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-districts-District.html b/resources/templates/auto/form-districts-District.html
index eb692a7..851e38f 100644
--- a/resources/templates/auto/form-districts-District.html
+++ b/resources/templates/auto/form-districts-District.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-districts-District.html generated 2018-06-29T16:36:20.120Z by adl.to-selmer-templates.
+<!-- File form-districts-District.html generated 2018-06-30T11:36:00.870Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-dwellings-Dwelling.html b/resources/templates/auto/form-dwellings-Dwelling.html
index 850d68c..4a164ab 100644
--- a/resources/templates/auto/form-dwellings-Dwelling.html
+++ b/resources/templates/auto/form-dwellings-Dwelling.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-dwellings-Dwelling.html generated 2018-06-29T16:36:20.162Z by adl.to-selmer-templates.
+<!-- File form-dwellings-Dwelling.html generated 2018-06-30T11:36:00.911Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-electors-Elector.html b/resources/templates/auto/form-electors-Elector.html
index 1b6251a..d2ceff2 100644
--- a/resources/templates/auto/form-electors-Elector.html
+++ b/resources/templates/auto/form-electors-Elector.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-electors-Elector.html generated 2018-06-29T16:36:20.144Z by adl.to-selmer-templates.
+<!-- File form-electors-Elector.html generated 2018-06-30T11:36:00.894Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-followupactions-Followupaction.html b/resources/templates/auto/form-followupactions-Followupaction.html
index ef4bd47..9486e73 100644
--- a/resources/templates/auto/form-followupactions-Followupaction.html
+++ b/resources/templates/auto/form-followupactions-Followupaction.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-followupactions-Followupaction.html generated 2018-06-29T16:36:20.165Z by adl.to-selmer-templates.
+<!-- File form-followupactions-Followupaction.html generated 2018-06-30T11:36:00.914Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -73,7 +73,7 @@ actor
 <div class='select-box' farside='canvassers' found='true'>
 <input name='actor-search-box' onchange='/* javascript to repopulate the select widget */'/>
 <select id='actor' name='actor' comment='JavaScript stuff to fix up aynchronous loading'>
-{% for record in canvassers %}<option value='{{record.id}}'>{{record.username}} {{record.fullname}} {{record.email}}</option>{% endfor %}
+{% for record in canvassers %}<option value='{{record.id}}'>{{record.username}} {{record.fullname}} {{record.address_id}} {{record.phone}} {{record.email}}</option>{% endfor %}
 </select>
 </div>
 {% else %}
diff --git a/resources/templates/auto/form-followupmethods-Followupmethod.html b/resources/templates/auto/form-followupmethods-Followupmethod.html
index 5a5171c..0ebe89e 100644
--- a/resources/templates/auto/form-followupmethods-Followupmethod.html
+++ b/resources/templates/auto/form-followupmethods-Followupmethod.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-followupmethods-Followupmethod.html generated 2018-06-29T16:36:20.167Z by adl.to-selmer-templates.
+<!-- File form-followupmethods-Followupmethod.html generated 2018-06-30T11:36:00.916Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-followuprequests-Followuprequest.html b/resources/templates/auto/form-followuprequests-Followuprequest.html
index ee12d56..810e20a 100644
--- a/resources/templates/auto/form-followuprequests-Followuprequest.html
+++ b/resources/templates/auto/form-followuprequests-Followuprequest.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-followuprequests-Followuprequest.html generated 2018-06-29T16:36:20.123Z by adl.to-selmer-templates.
+<!-- File form-followuprequests-Followuprequest.html generated 2018-06-30T11:36:00.874Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-genders-Gender.html b/resources/templates/auto/form-genders-Gender.html
index 238a638..33c1930 100644
--- a/resources/templates/auto/form-genders-Gender.html
+++ b/resources/templates/auto/form-genders-Gender.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-genders-Gender.html generated 2018-06-29T16:36:20.114Z by adl.to-selmer-templates.
+<!-- File form-genders-Gender.html generated 2018-06-30T11:36:00.862Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-intentions-Intention.html b/resources/templates/auto/form-intentions-Intention.html
index be4870d..b2287ec 100644
--- a/resources/templates/auto/form-intentions-Intention.html
+++ b/resources/templates/auto/form-intentions-Intention.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-intentions-Intention.html generated 2018-06-29T16:36:20.158Z by adl.to-selmer-templates.
+<!-- File form-intentions-Intention.html generated 2018-06-30T11:36:00.908Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-issues-Issue.html b/resources/templates/auto/form-issues-Issue.html
index 085cccc..cd89da2 100644
--- a/resources/templates/auto/form-issues-Issue.html
+++ b/resources/templates/auto/form-issues-Issue.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-issues-Issue.html generated 2018-06-29T16:36:20.133Z by adl.to-selmer-templates.
+<!-- File form-issues-Issue.html generated 2018-06-30T11:36:00.883Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-options-Option.html b/resources/templates/auto/form-options-Option.html
index d52fcda..5e4524b 100644
--- a/resources/templates/auto/form-options-Option.html
+++ b/resources/templates/auto/form-options-Option.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-options-Option.html generated 2018-06-29T16:36:20.157Z by adl.to-selmer-templates.
+<!-- File form-options-Option.html generated 2018-06-30T11:36:00.907Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-roles-Role.html b/resources/templates/auto/form-roles-Role.html
index 991549a..ed2f57a 100644
--- a/resources/templates/auto/form-roles-Role.html
+++ b/resources/templates/auto/form-roles-Role.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-roles-Role.html generated 2018-06-29T16:36:20.134Z by adl.to-selmer-templates.
+<!-- File form-roles-Role.html generated 2018-06-30T11:36:00.884Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -68,7 +68,7 @@ members
 <div class='select-box' farside='canvassers' found='true'>
 <input name='members-search-box' onchange='/* javascript to repopulate the select widget */'/>
 <select id='members' name='members' multiple='multiple' comment='JavaScript stuff to fix up aynchronous loading'>
-{% for record in canvassers %}<option value='{{record.id}}'>{{record.username}} {{record.fullname}} {{record.email}}</option>{% endfor %}
+{% for record in canvassers %}<option value='{{record.id}}'>{{record.username}} {{record.fullname}} {{record.address_id}} {{record.phone}} {{record.email}}</option>{% endfor %}
 </select>
 </div>
 {% else %}
diff --git a/resources/templates/auto/form-teams-Team.html b/resources/templates/auto/form-teams-Team.html
index ef80fdf..6f4bc0d 100644
--- a/resources/templates/auto/form-teams-Team.html
+++ b/resources/templates/auto/form-teams-Team.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-teams-Team.html generated 2018-06-29T16:36:20.141Z by adl.to-selmer-templates.
+<!-- File form-teams-Team.html generated 2018-06-30T11:36:00.891Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -109,7 +109,7 @@ members
 <div class='select-box' farside='canvassers' found='true'>
 <input name='members-search-box' onchange='/* javascript to repopulate the select widget */'/>
 <select id='members' name='members' multiple='multiple' comment='JavaScript stuff to fix up aynchronous loading'>
-{% for record in canvassers %}<option value='{{record.id}}'>{{record.username}} {{record.fullname}} {{record.email}}</option>{% endfor %}
+{% for record in canvassers %}<option value='{{record.id}}'>{{record.username}} {{record.fullname}} {{record.address_id}} {{record.phone}} {{record.email}}</option>{% endfor %}
 </select>
 </div>
 {% else %}
@@ -132,7 +132,7 @@ organisers
 <div class='select-box' farside='canvassers' found='true'>
 <input name='organisers-search-box' onchange='/* javascript to repopulate the select widget */'/>
 <select id='organisers' name='organisers' multiple='multiple' comment='JavaScript stuff to fix up aynchronous loading'>
-{% for record in canvassers %}<option value='{{record.id}}'>{{record.username}} {{record.fullname}} {{record.email}}</option>{% endfor %}
+{% for record in canvassers %}<option value='{{record.id}}'>{{record.username}} {{record.fullname}} {{record.address_id}} {{record.phone}} {{record.email}}</option>{% endfor %}
 </select>
 </div>
 {% else %}
diff --git a/resources/templates/auto/form-visits-Visit.html b/resources/templates/auto/form-visits-Visit.html
index 1a504dd..9482227 100644
--- a/resources/templates/auto/form-visits-Visit.html
+++ b/resources/templates/auto/form-visits-Visit.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-visits-Visit.html generated 2018-06-29T16:36:20.138Z by adl.to-selmer-templates.
+<!-- File form-visits-Visit.html generated 2018-06-30T11:36:00.888Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -73,7 +73,7 @@ canvasser_id
 <div class='select-box' farside='canvassers' found='true'>
 <input name='canvasser_id-search-box' onchange='/* javascript to repopulate the select widget */'/>
 <select id='canvasser_id' name='canvasser_id' comment='JavaScript stuff to fix up aynchronous loading'>
-{% for record in canvassers %}<option value='{{record.id}}'>{{record.username}} {{record.fullname}} {{record.email}}</option>{% endfor %}
+{% for record in canvassers %}<option value='{{record.id}}'>{{record.username}} {{record.fullname}} {{record.address_id}} {{record.phone}} {{record.email}}</option>{% endfor %}
 </select>
 </div>
 {% else %}
diff --git a/resources/templates/auto/list-addresses-Addresses.html b/resources/templates/auto/list-addresses-Addresses.html
index 8fed2b1..aa6e297 100644
--- a/resources/templates/auto/list-addresses-Addresses.html
+++ b/resources/templates/auto/list-addresses-Addresses.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-addresses-Addresses.html generated 2018-06-29T16:36:20.150Z by adl.to-selmer-templates.
+<!-- File list-addresses-Addresses.html generated 2018-06-30T11:36:00.900Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-authorities-Authorities.html b/resources/templates/auto/list-authorities-Authorities.html
index 98e5db9..d479410 100644
--- a/resources/templates/auto/list-authorities-Authorities.html
+++ b/resources/templates/auto/list-authorities-Authorities.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-authorities-Authorities.html generated 2018-06-29T16:36:20.122Z by adl.to-selmer-templates.
+<!-- File list-authorities-Authorities.html generated 2018-06-30T11:36:00.873Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-canvassers-Canvassers.html b/resources/templates/auto/list-canvassers-Canvassers.html
index 06f07a2..2e2daf8 100644
--- a/resources/templates/auto/list-canvassers-Canvassers.html
+++ b/resources/templates/auto/list-canvassers-Canvassers.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-canvassers-Canvassers.html generated 2018-06-29T16:36:20.161Z by adl.to-selmer-templates.
+<!-- File list-canvassers-Canvassers.html generated 2018-06-30T11:36:00.910Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-districts-Districts.html b/resources/templates/auto/list-districts-Districts.html
index 10aa521..5aa04b4 100644
--- a/resources/templates/auto/list-districts-Districts.html
+++ b/resources/templates/auto/list-districts-Districts.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-districts-Districts.html generated 2018-06-29T16:36:20.155Z by adl.to-selmer-templates.
+<!-- File list-districts-Districts.html generated 2018-06-30T11:36:00.905Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-dwellings-Dwellings.html b/resources/templates/auto/list-dwellings-Dwellings.html
index ff846fd..d4a5468 100644
--- a/resources/templates/auto/list-dwellings-Dwellings.html
+++ b/resources/templates/auto/list-dwellings-Dwellings.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-dwellings-Dwellings.html generated 2018-06-29T16:36:20.147Z by adl.to-selmer-templates.
+<!-- File list-dwellings-Dwellings.html generated 2018-06-30T11:36:00.897Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-electors-Electors.html b/resources/templates/auto/list-electors-Electors.html
index e55df8e..78da6fe 100644
--- a/resources/templates/auto/list-electors-Electors.html
+++ b/resources/templates/auto/list-electors-Electors.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-electors-Electors.html generated 2018-06-29T16:36:20.132Z by adl.to-selmer-templates.
+<!-- File list-electors-Electors.html generated 2018-06-30T11:36:00.882Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-followupactions-Followupactions.html b/resources/templates/auto/list-followupactions-Followupactions.html
index 25138cd..c0c7c29 100644
--- a/resources/templates/auto/list-followupactions-Followupactions.html
+++ b/resources/templates/auto/list-followupactions-Followupactions.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-followupactions-Followupactions.html generated 2018-06-29T16:36:20.160Z by adl.to-selmer-templates.
+<!-- File list-followupactions-Followupactions.html generated 2018-06-30T11:36:00.910Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-followupmethods-Followupmethods.html b/resources/templates/auto/list-followupmethods-Followupmethods.html
index 51cab99..fba6c0f 100644
--- a/resources/templates/auto/list-followupmethods-Followupmethods.html
+++ b/resources/templates/auto/list-followupmethods-Followupmethods.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-followupmethods-Followupmethods.html generated 2018-06-29T16:36:20.137Z by adl.to-selmer-templates.
+<!-- File list-followupmethods-Followupmethods.html generated 2018-06-30T11:36:00.887Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-followuprequests-Followuprequests.html b/resources/templates/auto/list-followuprequests-Followuprequests.html
index 4df3180..1a92655 100644
--- a/resources/templates/auto/list-followuprequests-Followuprequests.html
+++ b/resources/templates/auto/list-followuprequests-Followuprequests.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-followuprequests-Followuprequests.html generated 2018-06-29T16:36:20.117Z by adl.to-selmer-templates.
+<!-- File list-followuprequests-Followuprequests.html generated 2018-06-30T11:36:00.866Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-genders-Genders.html b/resources/templates/auto/list-genders-Genders.html
index e579f6a..d421968 100644
--- a/resources/templates/auto/list-genders-Genders.html
+++ b/resources/templates/auto/list-genders-Genders.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-genders-Genders.html generated 2018-06-29T16:36:20.110Z by adl.to-selmer-templates.
+<!-- File list-genders-Genders.html generated 2018-06-30T11:36:00.855Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-intentions-Intentions.html b/resources/templates/auto/list-intentions-Intentions.html
index 3e11a92..de75da8 100644
--- a/resources/templates/auto/list-intentions-Intentions.html
+++ b/resources/templates/auto/list-intentions-Intentions.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-intentions-Intentions.html generated 2018-06-29T16:36:20.164Z by adl.to-selmer-templates.
+<!-- File list-intentions-Intentions.html generated 2018-06-30T11:36:00.913Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-issues-Issues.html b/resources/templates/auto/list-issues-Issues.html
index 50875c0..af0eb2c 100644
--- a/resources/templates/auto/list-issues-Issues.html
+++ b/resources/templates/auto/list-issues-Issues.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-issues-Issues.html generated 2018-06-29T16:36:20.156Z by adl.to-selmer-templates.
+<!-- File list-issues-Issues.html generated 2018-06-30T11:36:00.906Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-options-Options.html b/resources/templates/auto/list-options-Options.html
index b7bce93..3479834 100644
--- a/resources/templates/auto/list-options-Options.html
+++ b/resources/templates/auto/list-options-Options.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-options-Options.html generated 2018-06-29T16:36:20.119Z by adl.to-selmer-templates.
+<!-- File list-options-Options.html generated 2018-06-30T11:36:00.868Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-roles-Roles.html b/resources/templates/auto/list-roles-Roles.html
index 09fe18d..8a2a73f 100644
--- a/resources/templates/auto/list-roles-Roles.html
+++ b/resources/templates/auto/list-roles-Roles.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-roles-Roles.html generated 2018-06-29T16:36:20.136Z by adl.to-selmer-templates.
+<!-- File list-roles-Roles.html generated 2018-06-30T11:36:00.886Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-teams-Teams.html b/resources/templates/auto/list-teams-Teams.html
index 582741b..bbc027c 100644
--- a/resources/templates/auto/list-teams-Teams.html
+++ b/resources/templates/auto/list-teams-Teams.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-teams-Teams.html generated 2018-06-29T16:36:20.113Z by adl.to-selmer-templates.
+<!-- File list-teams-Teams.html generated 2018-06-30T11:36:00.860Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-visits-Visits.html b/resources/templates/auto/list-visits-Visits.html
index ed998ee..bdcfddb 100644
--- a/resources/templates/auto/list-visits-Visits.html
+++ b/resources/templates/auto/list-visits-Visits.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-visits-Visits.html generated 2018-06-29T16:36:20.111Z by adl.to-selmer-templates.
+<!-- File list-visits-Visits.html generated 2018-06-30T11:36:00.858Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/base-authenticated.html b/resources/templates/base-authenticated.html
deleted file mode 100644
index cc067b0..0000000
--- a/resources/templates/base-authenticated.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1"/>
-    <link rel="stylesheet" type="text/css" href="css/yyy-common.css" />
-    <link rel="stylesheet" type="text/css" href="css/yyy-site.css" />
-    <link rel="stylesheet" type="text/css" href="css/spinner.css" />
-    <link href="https://fonts.googleapis.com/css?family=Archivo+Black|Archivo+Narrow" rel="stylesheet"/>
-    <title>{{title}}</title>
-  </head>
-  <body>
-    {% block whole-page %}
-    {% block top %}
-    <header>
-      <div id="nav">
-        <img id="nav-icon" src="img/threelines.png" alt="Menu"/>
-        <menu id="nav-menu" class="nav">
-          <li class=""><a href="home">Home</a></li>
-          <li class=""><a href="library">Library</a></li>
-          <li class=""><a href="register">Register</a></li>
-          <li class="">{% if user %}<a href="logout.html">Logout</a>
-            {% else %}<a href="login">Login</a>{% endif %}</li>
-          <li class=""><a href="about">About</a></li>
-          {% if user %}
-          <li id="user"><a href="profile">Logged in as {{user.fullname}}</a></li>
-          {% endif %}
-        </menu>
-      </div>
-
-      <h1>
-        {{title}}
-      </h1>
-    </header>
-    {% endblock %}
-    <div id="main-container" class="container">
-      <div id="back-link-container">
-        <a href="javascript:history.back()" id="back-link">Back</a>
-      </div>
-      <div id="big-links">
-        {% block big-links %}
-        {% endblock %}
-       </div>
-      <div if="#content">
-        {% block content %}
-        {% endblock %}
-      </div>
-    </div>
-    {% block foot %}
-    <footer>
-      <div id="credits">
-        <div>
-          <img src="img/credits/ric-logo.png" width="24" height="24"/>
-          A project of the
-          <a href="https://radical.scot/">Radical Independence Campaign</a> ||
-          Version {{version}}
-        </div>
-        <div>
-          <img height="16" width="16" alt="Clojure" src="img/credits/luminus-logo.png"/>Built with <a href="http://www.luminusweb.net/">LuminusWeb</a> ||
-          <img height="16" width="16" alt="Clojure" src="img/credits/clojure-icon.gif"/> Powered by <a href="http://clojure.org">Clojure</a> ||
-          <img height="16" width="16" alt="GitHub" src="img/credits/github-logo-transparent.png"/>Find me/fork me on <a href="https://github.com/simon-brooke/smeagol">Github</a> ||
-          <img height="16" width="16" alt="Free Software Foundation" src="img/credits/gnu.small.png"/>Licensed under the <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License version 2.0</a>
-        </div>
-      </div>
-    </footer>
-    {% endblock %}
-    {% endblock %}
-    <script type="text/javascript">
-        var context = "{{servlet-context}}";
-        var csrfToken = "{{csrf-token}}";
-    </script>
-    {% block extra-script %}
-    {% endblock %}
-  </body>
-</html>
-
-
-
-
diff --git a/resources/templates/base-unauthenticated.html b/resources/templates/base-unauthenticated.html
deleted file mode 100644
index cfb278f..0000000
--- a/resources/templates/base-unauthenticated.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:html="http://www.w3.org/1999/xhtml">
-  <head>
-    <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" type="text/css" href="css/yyy-common.css" />
-    <link rel="stylesheet" type="text/css" href="css/yyy-site.css" />
-    <link href="https://fonts.googleapis.com/css?family=Archivo+Black|Archivo+Narrow" rel="stylesheet"/>
-    <title>{% block title %}{% endblock %}{{title}}</title>
-  </head>
-  <body>
-    <header>
-      <div id="nav">
-        <img id="nav-icon" src="img/threelines.png" alt="Menu"/>
-        <menu id="nav-menu" class="nav">
-          <li class=""><a href="home">Home</a></li>
-          <li class=""><a href="auth">Login</a></li>
-          <li class=""><a href="about">About</a></li>
-        </menu>
-      </div>
-
-      <h1>
-        {{title}}
-      </h1>
-    </header>
-
-    <div id="main-container" class="container">
-      <div id="big-links">
-        {% block big-links %}
-        {% endblock %}
-      </div>
-      <div if="#content">
-        {% block content %}
-        {% endblock %}
-      </div>
-    </div>
-    <footer>
-      <div id="credits">
-        <div>
-          <img src="img/credits/ric-logo.png" width="24" height="24"/>
-          A project of the
-          <a href="https://radical.scot/">Radical Independence Campaign</a> ||
-          Version {{version}}
-        </div>
-        <div>
-          <img height="16" width="16" alt="Clojure" src="img/credits/luminus-logo.png"/>Built with <a href="http://www.luminusweb.net/">LuminusWeb</a> ||
-          <img height="16" width="16" alt="Clojure" src="img/credits/clojure-icon.gif"/> Powered by <a href="http://clojure.org">Clojure</a> ||
-          <img height="16" width="16" alt="GitHub" src="img/credits/github-logo-transparent.png"/>Find me/fork me on <a href="https://github.com/simon-brooke/smeagol">Github</a> ||
-          <img height="16" width="16" alt="Free Software Foundation" src="img/credits/gnu.small.png"/>Licensed under the <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License version 2.0</a>
-        </div>
-      </div>
-    </footer>
-    <script type="text/javascript">
-        var context = "{{servlet-context}}";
-        var csrfToken = "{{csrf-token}}";
-    </script>
-  </body>
-</html>
diff --git a/resources/templates/base.html b/resources/templates/base.html
index e9add78..227b668 100644
--- a/resources/templates/base.html
+++ b/resources/templates/base.html
@@ -7,10 +7,15 @@
     <link rel="stylesheet" type="text/css" href="css/yyy-site.css" />
     <link rel="stylesheet" type="text/css" href="css/spinner.css" />
     <link href="https://fonts.googleapis.com/css?family=Archivo+Black|Archivo+Narrow" rel="stylesheet"/>
-    <title>{{title}}</title>
+    <title>{{site-title}}: {{title}}</title>
+    {% block extra-head %}
+    <!-- extra-head: put any additional markup to go into the head of your document into this block -->
+    <!-- e.g. script tags, link tags -->
+    {% endblock %}
   </head>
   <body>
     {% block whole-page %}
+    <!-- whole-page: if you want an entire custom page layout, override this block. -->
     {% block top %}
     <header>
       <div id="nav">
@@ -27,10 +32,8 @@
           {% endif %}
         </menu>
       </div>
-
-      <h1>
-        {{title}}
-      </h1>
+      <img id="site-logo" src="{{site-logo}}" alt="{{site-title}}" width="64" height="64"/>
+      <h1>{{title}}</h1>
     </header>
     {% endblock %}
     <div id="main-container" class="container">
@@ -39,15 +42,18 @@
       </div>
       <div id="big-links">
         {% block big-links %}
+        <!-- big-links: put any main navigation links into this block -->
         {% endblock %}
        </div>
       <div if="#content">
         {% block content %}
+        <!-- content: put your main page content into this block -->
         {% endblock %}
       </div>
       <br clear="both"/>
     </div>
     {% block foot %}
+    <!-- foot: override this block if you don't want the standard footer -->
     <footer>
       <div id="credits">
         <div>
@@ -66,11 +72,18 @@
     </footer>
     {% endblock %}
     {% endblock %}
+    {% block extra-tail %}
+    <!-- extra-tail: put markup here which needs to be at the very end of the body -->
+    <!-- e.g. some javascript script tags, some link tags -->
+    {% endblock %}
     <script type="text/javascript">
+        //<![CDATA[
         var context = "{{servlet-context}}";
         var csrfToken = "{{csrf-token}}";
         {% block extra-script %}
+        /* extra-script: put any actual javascript source text you need into this block */
         {% endblock %}
+        //]]>
     </script>
   </body>
 </html>
diff --git a/resources/templates/call-me-accepted.html b/resources/templates/call-me-accepted.html
index a720998..9bcc836 100644
--- a/resources/templates/call-me-accepted.html
+++ b/resources/templates/call-me-accepted.html
@@ -1,41 +1,15 @@
-{% extends "base-unauthenticated.html" %}
+{% extends "base.html" %}
 {% block big-links %}
-      <div id="back-link-container">
-        <a href="javascript:history.back()" id="back-link">Back</a>
-      </div>
       <div class="big-link-container">
         <a href="library" class="big-link" id="library-link">Browse&nbsp;the&nbsp;issues</a>
       </div>
 {% endblock %}
 {% block content %}
+<h2>
+  We'll be in touch!
+</h2>
       <p>
         Thank you, {{name}}. Someone will call you shortly on {{phone}} to talk to you about
         {{concern}}.
       </p>
-      <form action="call-me" method="post">
-        <p class="widget">
-          <label for="name">Your name</label>
-          <input type="text" id="name" name="name"/>
-        </p>
-        <p class="widget">
-          <label for="postcode">Your post-code</label>
-          <input type="text" id="postcode" name="postcode"/>
-        </p>
-        <p class="widget">
-          <label for="phone">Your phone number</label>
-          <input type="text" id="phone" name="phone"/>
-        </p>
-        <p class="widget">
-          <label for="concern">Your concerns</label>
-          <select name="concern" id="concern">
-            {% for concern in concerns %}
-            <option>{{concern.title}}</option>
-            {% endfor %}
-          </select>
-        </p>
-        <p class="widget">
-          <label for="submit">&nbsp;</label>
-          <input name="submit" id="submit" type="submit" class="action" value="Call me!"/>
-        </p>
-      </form>
 {% endblock %}
diff --git a/resources/templates/call-me.html b/resources/templates/call-me.html
index 299e97d..bb2414e 100644
--- a/resources/templates/call-me.html
+++ b/resources/templates/call-me.html
@@ -1,14 +1,10 @@
-{% extends "base-unauthenticated.html" %}
-{% block big-links %}
-      <div id="back-link-container">
-        <a href="javascript:history.back()" id="back-link">Back</a>
-      </div>
-{% endblock %}
+{% extends "base.html" %}
 {% block content %}
       <p>
         Use this form to request someone to phone you to discuss your concerns about independence.
       </p>
       <form action="call-me" method="post">
+        {% csrf-field %}
         <p class="widget">
           <label for="name">Your name</label>
           <input type="text" id="name" name="name"/>
@@ -25,7 +21,7 @@
           <label for="concern">Your concerns</label>
           <select name="concern" id="concern">
             {% for concern in concerns %}
-            <option>{{concern.title}}</option>
+            <option>{{concern.id}}</option>
             {% endfor %}
           </select>
         </p>
diff --git a/resources/templates/canvasser.html b/resources/templates/canvasser.html
index b223313..ceb6c6c 100644
--- a/resources/templates/canvasser.html
+++ b/resources/templates/canvasser.html
@@ -1,4 +1,4 @@
-{% extends "base-authenticated.html" %}
+{% extends "base.html" %}
 {% block title %}
 {% endblock %}
 {% block content %}
diff --git a/resources/templates/home.html b/resources/templates/home.html
index ea4c068..59a851f 100644
--- a/resources/templates/home.html
+++ b/resources/templates/home.html
@@ -1,4 +1,4 @@
-{% extends "base-unauthenticated.html" %}
+{% extends "base.html" %}
 {% block big-links %}
       <div class="big-link-container">
         <a href="supporter" class="big-link" id="yes-link">Yes</a>
@@ -7,3 +7,13 @@
         <a href="notyet" class="big-link" id="not-yet-link">No</a>
       </div>
 {% endblock %}
+{% block content %}
+<h2>
+  Alpha test code
+</h2>
+<p>
+  Although addresses in the database mostly are real, all personal data in the database
+  is randomly generated and does not represent real people.
+</p>
+{% endblock %}
+
diff --git a/resources/templates/login.html b/resources/templates/login.html
index fab8b01..0d305b6 100644
--- a/resources/templates/login.html
+++ b/resources/templates/login.html
@@ -1,9 +1,6 @@
-{% extends "base-unauthenticated.html" %}
-{% block content %}
-      <div id="back-link-container">
-        <a href="javascript:history.back()" id="back-link">Back</a>
-      </div>
-      {% for authority in authorities %}
+{% extends "base.html" %}
+{% block big-links %}
+     {% for authority in authorities %}
       <div class="big-link-container">
         <a href="auth?authority={{authority.id}}" class="big-link" id="{{authority.id}}-link">
           <img src="img/authorities/{{authority.id}}.png" width="32" height="32" alt="{{authority.id}}"/>
@@ -11,6 +8,9 @@
         </a>
       </div>
       {% endfor %}
+{% endblock %}
+
+{% block content %}
       <form action="auth" method="post">
         {% csrf-field %}
         <h2>
diff --git a/resources/templates/notyet.html b/resources/templates/notyet.html
index 47b9fec..9574c55 100644
--- a/resources/templates/notyet.html
+++ b/resources/templates/notyet.html
@@ -1,4 +1,4 @@
-{% extends "base-unauthenticated.html" %}
+{% extends "base.html" %}
 {% block big-links %}
       <div id="back-link-container">
         <a href="javascript:history.back()" id="back-link">Back</a>
diff --git a/resources/templates/roles.html b/resources/templates/roles.html
index 821cb31..ba07afe 100644
--- a/resources/templates/roles.html
+++ b/resources/templates/roles.html
@@ -1,4 +1,4 @@
-{% extends "base-authenticated.html" %}
+{% extends "base.html" %}
 {% block title %}
   {{ user }}
 {% endblock %}
diff --git a/resources/templates/supporter.html b/resources/templates/supporter.html
index 9e4f88e..1bcfc39 100644
--- a/resources/templates/supporter.html
+++ b/resources/templates/supporter.html
@@ -1,9 +1,6 @@
-{% extends "base-unauthenticated.html" %}
+{% extends "base.html" %}
 {% block big-links %}
-      <div id="back-link-container">
-        <a href="javascript:history.back()" id="back-link">Back</a>
-      </div>
-      <div class="big-link-container">
+     <div class="big-link-container">
         <a href="auth" class="big-link" id="yes-link">Yes</a>
       </div>
       <div class="big-link-container">
diff --git a/src/clj/youyesyet/layout.clj b/src/clj/youyesyet/layout.clj
index 451a6a4..060082a 100644
--- a/src/clj/youyesyet/layout.clj
+++ b/src/clj/youyesyet/layout.clj
@@ -10,9 +10,32 @@
                     [ring.middleware.anti-forgery :refer [*anti-forgery-token*]]
                     [selmer.parser :as parser]
                     [selmer.filters :as filters]
+                    [youyesyet.config :refer [env]]
                     [youyesyet.db.core :as db]
                     ))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;
+;;;; youyesyet.layout: lay out Selmer-templated web pages.
+;;;;
+;;;; This program is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU General Public License
+;;;; as published by the Free Software Foundation; either version 2
+;;;; of the License, or (at your option) any later version.
+;;;;
+;;;; This program is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with this program; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+;;;; USA.
+;;;;
+;;;; Copyright (C) 2016 Simon Brooke for Radical Independence Campaign
+;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
 (declare ^:dynamic *app-context*)
@@ -47,6 +70,8 @@
             :csrf-token *anti-forgery-token*
             :user user
             :user-roles (get-user-roles user)
+            :site-title (:site-title env)
+            :site-logo (:site-logo env)
             :version (System/getProperty "youyesyet.version"))))
       "text/html; charset=utf-8")))
 
diff --git a/src/clj/youyesyet/routes/auto.clj b/src/clj/youyesyet/routes/auto.clj
index 314cb87..4e02a3a 100644
--- a/src/clj/youyesyet/routes/auto.clj
+++ b/src/clj/youyesyet/routes/auto.clj
@@ -1,6 +1,6 @@
 (ns
  youyesyet.routes.auto
- "User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180629T222155.170Z"
+ "User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180630T113600.562Z"
  (:require
   [adl-support.core :as support]
   [clojure.java.io :as io]
@@ -18,6 +18,7 @@
  [r]
  (l/render
   (support/resolve-template "application-index.html")
+  (:session r)
   {:title "Administrative menu"}))
 
 (defn
diff --git a/src/clj/youyesyet/routes/auto_json.clj b/src/clj/youyesyet/routes/auto_json.clj
index 8fe7fd9..cccc570 100644
--- a/src/clj/youyesyet/routes/auto_json.clj
+++ b/src/clj/youyesyet/routes/auto_json.clj
@@ -1,9 +1,10 @@
 (ns
  youyesyet.routes.auto-json
- "JSON routes for youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180629T163618.749Z"
+ "JSON routes for youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180630T113559.533Z"
  (:require
   [adl-support.core :as support]
   [clojure.java.io :as io]
+  [clojure.core.memoize :as memo]
   [compojure.core :refer [defroutes GET POST]]
   [hugsql.core :as hugsql]
   [noir.response :as nresponse]
@@ -11,126 +12,767 @@
   [ring.util.http-response :as response]
   [youyesyet.db.core :as db]))
 
-
-(declare
+(defn
  create-address!
- create-authority!
- create-canvasser!
- create-district!
- create-dwelling!
- create-elector!
- create-followupaction!
- create-followupmethod!
- create-followuprequest!
- create-gender!
- create-intention!
- create-issue!
- create-option!
- create-role!
- create-team!
- create-visit!
- delete-address!
- delete-authority!
- delete-canvasser!
- delete-district!
- delete-dwelling!
- delete-elector!
- delete-followupaction!
- delete-followupmethod!
- delete-followuprequest!
- delete-gender!
- delete-intention!
- delete-issue!
- delete-option!
- delete-role!
- delete-team!
- delete-visit!
- get-address
- get-authority
- get-canvasser
- get-canvasser-by-username
- get-district
- get-dwelling
- get-elector
- get-followupaction
- get-followupmethod
- get-followuprequest
- get-gender
- get-intention
- get-issue
- get-option
- get-role
- get-role-by-name
- get-team
- get-visit
- list-addresses
- list-addresses-by-district
- list-authorities
- list-canvassers
- list-canvassers-by-address
- list-canvassers-by-authority
- list-canvassers-by-elector
- list-canvassers-by-role
- list-districts
- list-dwellings
- list-dwellings-by-address
- list-electors
- list-electors-by-dwelling
- list-electors-by-gender
- list-followupactions
- list-followupactions-by-canvasser
- list-followupactions-by-followuprequest
- list-followupmethods
- list-followuprequests
- list-followuprequests-by-elector
- list-followuprequests-by-followupmethod
- list-followuprequests-by-issue
- list-followuprequests-by-visit
- list-genders
- list-intentions
- list-intentions-by-elector
- list-intentions-by-option
- list-intentions-by-visit
- list-issues
- list-options
- list-roles
- list-roles-by-canvasser
- list-teams
- list-teams-by-canvasser
- list-teams-by-district
- list-visits
- list-visits-by-address
- list-visits-by-canvasser
- search-strings-address
- search-strings-authority
- search-strings-canvasser
- search-strings-district
- search-strings-dwelling
- search-strings-elector
- search-strings-followupaction
- search-strings-followupmethod
- search-strings-followuprequest
- search-strings-gender
- search-strings-intention
- search-strings-issue
- search-strings-option
- search-strings-role
- search-strings-team
- search-strings-visit
- update-address!
- update-authority!
- update-canvasser!
- update-district!
- update-dwelling!
- update-elector!
- update-followupaction!
- update-followuprequest!
- update-intention!
- update-issue!
- update-role!
- update-team!
- update-visit!)
+ "Auto-generated method to insert one record to the `addresses` table. Expects the following key(s) to be present in `params`: `(:address :postcode :phone :district_id :latitude :longitude :locality)`. Returns a map containing the keys `#{\"id\"}` identifying the record created."
+ [{:keys [params]}]
+ (do (db/create-address! params)))
 
+(defn
+ create-authority!
+ "Auto-generated method to insert one record to the `authorities` table. Expects the following key(s) to be present in `params`: `(:request-token-uri :access-token-uri :authorize-uri :consumer-key :consumer-secret :id)`. Returns a map containing the keys `#{\"id\"}` identifying the record created."
+ [{:keys [params]}]
+ (do (db/create-authority! params)))
+
+(defn
+ create-canvasser!
+ "Auto-generated method to insert one record to the `canvassers` table. Expects the following key(s) to be present in `params`: `(:username :fullname :elector_id :address_id :phone :email :authority_id :authorised)`. Returns a map containing the keys `#{\"id\"}` identifying the record created."
+ [{:keys [params]}]
+ (do (db/create-canvasser! params)))
+
+(defn
+ create-district!
+ "Auto-generated method to insert one record to the `districts` table. Expects the following key(s) to be present in `params`: `(:name)`. Returns a map containing the keys `#{\"id\"}` identifying the record created."
+ [{:keys [params]}]
+ (do (db/create-district! params)))
+
+(defn
+ create-dwelling!
+ "Auto-generated method to insert one record to the `dwellings` table. Expects the following key(s) to be present in `params`: `(:address_id :sub-address)`. Returns a map containing the keys `#{\"id\"}` identifying the record created."
+ [{:keys [params]}]
+ (do (db/create-dwelling! params)))
+
+(defn
+ create-elector!
+ "Auto-generated method to insert one record to the `electors` table. Expects the following key(s) to be present in `params`: `(:name :dwelling_id :phone :email :gender)`. Returns a map containing the keys `#{\"id\"}` identifying the record created."
+ [{:keys [params]}]
+ (do (db/create-elector! params)))
+
+(defn
+ create-followupaction!
+ "Auto-generated method to insert one record to the `followupactions` table. Expects the following key(s) to be present in `params`: `(:request_id :actor :date :notes :closed)`. Returns a map containing the keys `#{\"id\"}` identifying the record created."
+ [{:keys [params]}]
+ (do (db/create-followupaction! params)))
+
+(defn
+ create-followupmethod!
+ "Auto-generated method to insert one record to the `followupmethods` table. Expects the following key(s) to be present in `params`: `(:id)`. Returns a map containing the keys `#{\"id\"}` identifying the record created."
+ [{:keys [params]}]
+ (do (db/create-followupmethod! params)))
+
+(defn
+ create-followuprequest!
+ "Auto-generated method to insert one record to the `followuprequests` table. Expects the following key(s) to be present in `params`: `(:elector_id :visit_id :issue_id :method_id)`. Returns a map containing the keys `#{\"id\"}` identifying the record created."
+ [{:keys [params]}]
+ (do (db/create-followuprequest! params)))
+
+(defn
+ create-gender!
+ "Auto-generated method to insert one record to the `genders` table. Expects the following key(s) to be present in `params`: `(:id)`. Returns a map containing the keys `#{\"id\"}` identifying the record created."
+ [{:keys [params]}]
+ (do (db/create-gender! params)))
+
+(defn
+ create-intention!
+ "Auto-generated method to insert one record to the `intentions` table. Expects the following key(s) to be present in `params`: `(:visit_id :elector_id :option_id :locality)`. Returns a map containing the keys `#{\"Id\"}` identifying the record created."
+ [{:keys [params]}]
+ (do (db/create-intention! params)))
+
+(defn
+ create-issue!
+ "Auto-generated method to insert one record to the `issues` table. Expects the following key(s) to be present in `params`: `(:url :current :id)`. Returns a map containing the keys `#{\"id\"}` identifying the record created."
+ [{:keys [params]}]
+ (do (db/create-issue! params)))
+
+(defn
+ create-option!
+ "Auto-generated method to insert one record to the `options` table. Expects the following key(s) to be present in `params`: `(:id)`. Returns a map containing the keys `#{\"id\"}` identifying the record created."
+ [{:keys [params]}]
+ (do (db/create-option! params)))
+
+(defn
+ create-role!
+ "Auto-generated method to insert one record to the `roles` table. Expects the following key(s) to be present in `params`: `(:name)`. Returns a map containing the keys `#{\"id\"}` identifying the record created."
+ [{:keys [params]}]
+ (do (db/create-role! params)))
+
+(defn
+ create-team!
+ "Auto-generated method to insert one record to the `teams` table. Expects the following key(s) to be present in `params`: `(:name :district_id :latitude :longitude)`. Returns a map containing the keys `#{\"id\"}` identifying the record created."
+ [{:keys [params]}]
+ (do (db/create-team! params)))
+
+(defn
+ create-visit!
+ "Auto-generated method to insert one record to the `visits` table. Expects the following key(s) to be present in `params`: `(:address_id :canvasser_id :date)`. Returns a map containing the keys `#{\"id\"}` identifying the record created."
+ [{:keys [params]}]
+ (do (db/create-visit! params)))
+
+(defn
+ delete-address!
+ "Auto-generated method to delete one record from the `addresses` table. Expects the following key(s) to be present in `params`: `#{\"id\"}`."
+ [{:keys [params]}]
+ (do (db/delete-address! params))
+ (response/found "/"))
+
+(defn
+ delete-authority!
+ "Auto-generated method to delete one record from the `authorities` table. Expects the following key(s) to be present in `params`: `#{\"id\"}`."
+ [{:keys [params]}]
+ (do (db/delete-authority! params))
+ (response/found "/"))
+
+(defn
+ delete-canvasser!
+ "Auto-generated method to delete one record from the `canvassers` table. Expects the following key(s) to be present in `params`: `#{\"id\"}`."
+ [{:keys [params]}]
+ (do (db/delete-canvasser! params))
+ (response/found "/"))
+
+(defn
+ delete-district!
+ "Auto-generated method to delete one record from the `districts` table. Expects the following key(s) to be present in `params`: `#{\"id\"}`."
+ [{:keys [params]}]
+ (do (db/delete-district! params))
+ (response/found "/"))
+
+(defn
+ delete-dwelling!
+ "Auto-generated method to delete one record from the `dwellings` table. Expects the following key(s) to be present in `params`: `#{\"id\"}`."
+ [{:keys [params]}]
+ (do (db/delete-dwelling! params))
+ (response/found "/"))
+
+(defn
+ delete-elector!
+ "Auto-generated method to delete one record from the `electors` table. Expects the following key(s) to be present in `params`: `#{\"id\"}`."
+ [{:keys [params]}]
+ (do (db/delete-elector! params))
+ (response/found "/"))
+
+(defn
+ delete-followupaction!
+ "Auto-generated method to delete one record from the `followupactions` table. Expects the following key(s) to be present in `params`: `#{\"id\"}`."
+ [{:keys [params]}]
+ (do (db/delete-followupaction! params))
+ (response/found "/"))
+
+(defn
+ delete-followupmethod!
+ "Auto-generated method to delete one record from the `followupmethods` table. Expects the following key(s) to be present in `params`: `#{\"id\"}`."
+ [{:keys [params]}]
+ (do (db/delete-followupmethod! params))
+ (response/found "/"))
+
+(defn
+ delete-followuprequest!
+ "Auto-generated method to delete one record from the `followuprequests` table. Expects the following key(s) to be present in `params`: `#{\"id\"}`."
+ [{:keys [params]}]
+ (do (db/delete-followuprequest! params))
+ (response/found "/"))
+
+(defn
+ delete-gender!
+ "Auto-generated method to delete one record from the `genders` table. Expects the following key(s) to be present in `params`: `#{\"id\"}`."
+ [{:keys [params]}]
+ (do (db/delete-gender! params))
+ (response/found "/"))
+
+(defn
+ delete-intention!
+ "Auto-generated method to delete one record from the `intentions` table. Expects the following key(s) to be present in `params`: `#{\"Id\"}`."
+ [{:keys [params]}]
+ (do (db/delete-intention! params))
+ (response/found "/"))
+
+(defn
+ delete-issue!
+ "Auto-generated method to delete one record from the `issues` table. Expects the following key(s) to be present in `params`: `#{\"id\"}`."
+ [{:keys [params]}]
+ (do (db/delete-issue! params))
+ (response/found "/"))
+
+(defn
+ delete-option!
+ "Auto-generated method to delete one record from the `options` table. Expects the following key(s) to be present in `params`: `#{\"id\"}`."
+ [{:keys [params]}]
+ (do (db/delete-option! params))
+ (response/found "/"))
+
+(defn
+ delete-role!
+ "Auto-generated method to delete one record from the `roles` table. Expects the following key(s) to be present in `params`: `#{\"id\"}`."
+ [{:keys [params]}]
+ (do (db/delete-role! params))
+ (response/found "/"))
+
+(defn
+ delete-team!
+ "Auto-generated method to delete one record from the `teams` table. Expects the following key(s) to be present in `params`: `#{\"id\"}`."
+ [{:keys [params]}]
+ (do (db/delete-team! params))
+ (response/found "/"))
+
+(defn
+ delete-visit!
+ "Auto-generated method to delete one record from the `visits` table. Expects the following key(s) to be present in `params`: `#{\"id\"}`."
+ [{:keys [params]}]
+ (do (db/delete-visit! params))
+ (response/found "/"))
+
+(def
+ get-address
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/get-address params)) nil)
+  :ttl/threshold
+  1000000000))
+
+(def
+ get-authority
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/get-authority params)) nil)
+  :ttl/threshold
+  10000000000))
+
+(def
+ get-canvasser
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/get-canvasser params)) nil)
+  :ttl/threshold
+  10000000))
+
+(def
+ get-canvasser-by-username
+ (memo/ttl
+  (fn
+   [{:keys [params]}]
+   (do (db/get-canvasser-by-username params))
+   nil)
+  :ttl/threshold
+  10000000))
+
+(def
+ get-district
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/get-district params)) nil)
+  :ttl/threshold
+  10000000000))
+
+(def
+ get-dwelling
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/get-dwelling params)) nil)
+  :ttl/threshold
+  1000000000))
+
+(def
+ get-elector
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/get-elector params)) nil)
+  :ttl/threshold
+  100000000))
+
+(defn
+ get-followupaction
+ "Auto-generated method to select one record from the `followupactions` table. Expects the following key(s) to be present in `params`: `#{\"id\"}`. Returns a map containing the following keys: `clojure.lang.LazySeq@6b32af0e`."
+ [{:keys [params]}]
+ (do (db/get-followupaction params)))
+
+(def
+ get-followupmethod
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/get-followupmethod params)) nil)
+  :ttl/threshold
+  10000000000))
+
+(def
+ get-followuprequest
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/get-followuprequest params)) nil)
+  :ttl/threshold
+  100000))
+
+(def
+ get-gender
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/get-gender params)) nil)
+  :ttl/threshold
+  1000000000))
+
+(defn
+ get-intention
+ "Auto-generated method to select one record from the `intentions` table. Expects the following key(s) to be present in `params`: `#{\"Id\"}`. Returns a map containing the following keys: `clojure.lang.LazySeq@27b20cd9`."
+ [{:keys [params]}]
+ (do (db/get-intention params)))
+
+(def
+ get-issue
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/get-issue params)) nil)
+  :ttl/threshold
+  1000000))
+
+(def
+ get-option
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/get-option params)) nil)
+  :ttl/threshold
+  10000000000))
+
+(def
+ get-role
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/get-role params)) nil)
+  :ttl/threshold
+  10000000000))
+
+(def
+ get-role-by-name
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/get-role-by-name params)) nil)
+  :ttl/threshold
+  10000000000))
+
+(def
+ get-team
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/get-team params)) nil)
+  :ttl/threshold
+  10000000))
+
+(def
+ get-visit
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/get-visit params)) nil)
+  :ttl/threshold
+  100000))
+
+(def
+ list-addresses
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/list-addresses params)) nil)
+  :ttl/threshold
+  1000000000))
+
+(defn
+ list-addresses-by-district
+ [{:keys [params]}]
+ (do (db/list-addresses-by-district params)))
+
+(def
+ list-authorities
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/list-authorities params)) nil)
+  :ttl/threshold
+  10000000000))
+
+(def
+ list-canvassers
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/list-canvassers params)) nil)
+  :ttl/threshold
+  10000000))
+
+(defn
+ list-canvassers-by-address
+ [{:keys [params]}]
+ (do (db/list-canvassers-by-address params)))
+
+(defn
+ list-canvassers-by-authority
+ [{:keys [params]}]
+ (do (db/list-canvassers-by-authority params)))
+
+(defn
+ list-canvassers-by-elector
+ [{:keys [params]}]
+ (do (db/list-canvassers-by-elector params)))
+
+(defn
+ list-canvassers-by-role
+ [{:keys [params]}]
+ (do (db/list-canvassers-by-role params)))
+
+(def
+ list-districts
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/list-districts params)) nil)
+  :ttl/threshold
+  10000000000))
+
+(def
+ list-dwellings
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/list-dwellings params)) nil)
+  :ttl/threshold
+  1000000000))
+
+(defn
+ list-dwellings-by-address
+ [{:keys [params]}]
+ (do (db/list-dwellings-by-address params)))
+
+(def
+ list-electors
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/list-electors params)) nil)
+  :ttl/threshold
+  100000000))
+
+(defn
+ list-electors-by-dwelling
+ [{:keys [params]}]
+ (do (db/list-electors-by-dwelling params)))
+
+(defn
+ list-electors-by-gender
+ [{:keys [params]}]
+ (do (db/list-electors-by-gender params)))
+
+(defn
+ list-followupactions
+ "Auto-generated method to select all records from the `followupactions` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(:request_id :actor :date :notes :closed :id)`."
+ [{:keys [params]}]
+ (do (db/list-followupactions params)))
+
+(defn
+ list-followupactions-by-canvasser
+ [{:keys [params]}]
+ (do (db/list-followupactions-by-canvasser params)))
+
+(defn
+ list-followupactions-by-followuprequest
+ [{:keys [params]}]
+ (do (db/list-followupactions-by-followuprequest params)))
+
+(def
+ list-followupmethods
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/list-followupmethods params)) nil)
+  :ttl/threshold
+  10000000000))
+
+(def
+ list-followuprequests
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/list-followuprequests params)) nil)
+  :ttl/threshold
+  100000))
+
+(defn
+ list-followuprequests-by-elector
+ [{:keys [params]}]
+ (do (db/list-followuprequests-by-elector params)))
+
+(defn
+ list-followuprequests-by-followupmethod
+ [{:keys [params]}]
+ (do (db/list-followuprequests-by-followupmethod params)))
+
+(defn
+ list-followuprequests-by-issue
+ [{:keys [params]}]
+ (do (db/list-followuprequests-by-issue params)))
+
+(defn
+ list-followuprequests-by-visit
+ [{:keys [params]}]
+ (do (db/list-followuprequests-by-visit params)))
+
+(def
+ list-genders
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/list-genders params)) nil)
+  :ttl/threshold
+  1000000000))
+
+(defn
+ list-intentions
+ "Auto-generated method to select all records from the `intentions` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(:visit_id :elector_id :option_id :locality :Id)`."
+ [{:keys [params]}]
+ (do (db/list-intentions params)))
+
+(defn
+ list-intentions-by-elector
+ [{:keys [params]}]
+ (do (db/list-intentions-by-elector params)))
+
+(defn
+ list-intentions-by-option
+ [{:keys [params]}]
+ (do (db/list-intentions-by-option params)))
+
+(defn
+ list-intentions-by-visit
+ [{:keys [params]}]
+ (do (db/list-intentions-by-visit params)))
+
+(def
+ list-issues
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/list-issues params)) nil)
+  :ttl/threshold
+  1000000))
+
+(def
+ list-options
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/list-options params)) nil)
+  :ttl/threshold
+  10000000000))
+
+(def
+ list-roles
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/list-roles params)) nil)
+  :ttl/threshold
+  10000000000))
+
+(defn
+ list-roles-by-canvasser
+ [{:keys [params]}]
+ (do (db/list-roles-by-canvasser params)))
+
+(def
+ list-teams
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/list-teams params)) nil)
+  :ttl/threshold
+  10000000))
+
+(defn
+ list-teams-by-canvasser
+ [{:keys [params]}]
+ (do (db/list-teams-by-canvasser params)))
+
+(defn
+ list-teams-by-district
+ [{:keys [params]}]
+ (do (db/list-teams-by-district params)))
+
+(def
+ list-visits
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/list-visits params)) nil)
+  :ttl/threshold
+  100000))
+
+(defn
+ list-visits-by-address
+ [{:keys [params]}]
+ (do (db/list-visits-by-address params)))
+
+(defn
+ list-visits-by-canvasser
+ [{:keys [params]}]
+ (do (db/list-visits-by-canvasser params)))
+
+(def
+ search-strings-address
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/search-strings-address params)) nil)
+  :ttl/threshold
+  1000000000))
+
+(def
+ search-strings-authority
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/search-strings-authority params)) nil)
+  :ttl/threshold
+  10000000000))
+
+(def
+ search-strings-canvasser
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/search-strings-canvasser params)) nil)
+  :ttl/threshold
+  10000000))
+
+(def
+ search-strings-district
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/search-strings-district params)) nil)
+  :ttl/threshold
+  10000000000))
+
+(def
+ search-strings-dwelling
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/search-strings-dwelling params)) nil)
+  :ttl/threshold
+  1000000000))
+
+(def
+ search-strings-elector
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/search-strings-elector params)) nil)
+  :ttl/threshold
+  100000000))
+
+(defn
+ search-strings-followupaction
+ "Auto-generated method to select all records from the `followupactions` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(:request_id :actor :date :notes :closed :id)`."
+ [{:keys [params]}]
+ (do (db/search-strings-followupaction params)))
+
+(def
+ search-strings-followupmethod
+ (memo/ttl
+  (fn
+   [{:keys [params]}]
+   (do (db/search-strings-followupmethod params))
+   nil)
+  :ttl/threshold
+  10000000000))
+
+(def
+ search-strings-followuprequest
+ (memo/ttl
+  (fn
+   [{:keys [params]}]
+   (do (db/search-strings-followuprequest params))
+   nil)
+  :ttl/threshold
+  100000))
+
+(def
+ search-strings-gender
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/search-strings-gender params)) nil)
+  :ttl/threshold
+  1000000000))
+
+(defn
+ search-strings-intention
+ "Auto-generated method to select all records from the `intentions` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(:visit_id :elector_id :option_id :locality :Id)`."
+ [{:keys [params]}]
+ (do (db/search-strings-intention params)))
+
+(def
+ search-strings-issue
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/search-strings-issue params)) nil)
+  :ttl/threshold
+  1000000))
+
+(def
+ search-strings-option
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/search-strings-option params)) nil)
+  :ttl/threshold
+  10000000000))
+
+(def
+ search-strings-role
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/search-strings-role params)) nil)
+  :ttl/threshold
+  10000000000))
+
+(def
+ search-strings-team
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/search-strings-team params)) nil)
+  :ttl/threshold
+  10000000))
+
+(def
+ search-strings-visit
+ (memo/ttl
+  (fn [{:keys [params]}] (do (db/search-strings-visit params)) nil)
+  :ttl/threshold
+  100000))
+
+(defn
+ update-address!
+ "Auto-generated method to update one record in the `addresses` table. Expects the following key(s) to be present in `params`: `(:address :district_id :id :latitude :locality :longitude :phone :postcode)`."
+ [{:keys [params]}]
+ (do (db/update-address! params))
+ (response/found "/"))
+
+(defn
+ update-authority!
+ "Auto-generated method to update one record in the `authorities` table. Expects the following key(s) to be present in `params`: `(:access-token-uri :authorize-uri :consumer-key :consumer-secret :id :request-token-uri)`."
+ [{:keys [params]}]
+ (do (db/update-authority! params))
+ (response/found "/"))
+
+(defn
+ update-canvasser!
+ "Auto-generated method to update one record in the `canvassers` table. Expects the following key(s) to be present in `params`: `(:address_id :authorised :authority_id :elector_id :email :fullname :id :phone :username)`."
+ [{:keys [params]}]
+ (do (db/update-canvasser! params))
+ (response/found "/"))
+
+(defn
+ update-district!
+ "Auto-generated method to update one record in the `districts` table. Expects the following key(s) to be present in `params`: `(:id :name)`."
+ [{:keys [params]}]
+ (do (db/update-district! params))
+ (response/found "/"))
+
+(defn
+ update-dwelling!
+ "Auto-generated method to update one record in the `dwellings` table. Expects the following key(s) to be present in `params`: `(:address_id :id :sub-address)`."
+ [{:keys [params]}]
+ (do (db/update-dwelling! params))
+ (response/found "/"))
+
+(defn
+ update-elector!
+ "Auto-generated method to update one record in the `electors` table. Expects the following key(s) to be present in `params`: `(:dwelling_id :email :gender :id :name :phone)`."
+ [{:keys [params]}]
+ (do (db/update-elector! params))
+ (response/found "/"))
+
+(defn
+ update-followupaction!
+ "Auto-generated method to update one record in the `followupactions` table. Expects the following key(s) to be present in `params`: `(:actor :closed :date :id :notes :request_id)`."
+ [{:keys [params]}]
+ (do (db/update-followupaction! params))
+ (response/found "/"))
+
+(defn
+ update-followuprequest!
+ "Auto-generated method to update one record in the `followuprequests` table. Expects the following key(s) to be present in `params`: `(:elector_id :id :issue_id :method_id :visit_id)`."
+ [{:keys [params]}]
+ (do (db/update-followuprequest! params))
+ (response/found "/"))
+
+(defn
+ update-intention!
+ "Auto-generated method to update one record in the `intentions` table. Expects the following key(s) to be present in `params`: `(:Id :elector_id :locality :option_id :visit_id)`."
+ [{:keys [params]}]
+ (do (db/update-intention! params))
+ (response/found "/"))
+
+(defn
+ update-issue!
+ "Auto-generated method to update one record in the `issues` table. Expects the following key(s) to be present in `params`: `(:current :id :url)`."
+ [{:keys [params]}]
+ (do (db/update-issue! params))
+ (response/found "/"))
+
+(defn
+ update-role!
+ "Auto-generated method to update one record in the `roles` table. Expects the following key(s) to be present in `params`: `(:id :name)`."
+ [{:keys [params]}]
+ (do (db/update-role! params))
+ (response/found "/"))
+
+(defn
+ update-team!
+ "Auto-generated method to update one record in the `teams` table. Expects the following key(s) to be present in `params`: `(:district_id :id :latitude :longitude :name)`."
+ [{:keys [params]}]
+ (do (db/update-team! params))
+ (response/found "/"))
+
+(defn
+ update-visit!
+ "Auto-generated method to update one record in the `visits` table. Expects the following key(s) to be present in `params`: `(:address_id :canvasser_id :date :id)`."
+ [{:keys [params]}]
+ (do (db/update-visit! params))
+ (response/found "/"))
 
 (defroutes
  auto-rest-routes
@@ -602,714 +1244,3 @@
   "/json/auto/update-visit"
   request
   (route/restricted (update-visit! request))))
-
-
-(defn
- create-address!
- "Auto-generated method to insert one record to the `addresses` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
- [{:keys [params]}]
- (do (db/create-address! params)))
-
-(defn
- create-authority!
- "Auto-generated method to insert one record to the `authorities` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
- [{:keys [params]}]
- (do (db/create-authority! params)))
-
-(defn
- create-canvasser!
- "Auto-generated method to insert one record to the `canvassers` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
- [{:keys [params]}]
- (do (db/create-canvasser! params)))
-
-(defn
- create-district!
- "Auto-generated method to insert one record to the `districts` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
- [{:keys [params]}]
- (do (db/create-district! params)))
-
-(defn
- create-dwelling!
- "Auto-generated method to insert one record to the `dwellings` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
- [{:keys [params]}]
- (do (db/create-dwelling! params)))
-
-(defn
- create-elector!
- "Auto-generated method to insert one record to the `electors` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
- [{:keys [params]}]
- (do (db/create-elector! params)))
-
-(defn
- create-followupaction!
- "Auto-generated method to insert one record to the `followupactions` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
- [{:keys [params]}]
- (do (db/create-followupaction! params)))
-
-(defn
- create-followupmethod!
- "Auto-generated method to insert one record to the `followupmethods` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
- [{:keys [params]}]
- (do (db/create-followupmethod! params)))
-
-(defn
- create-followuprequest!
- "Auto-generated method to insert one record to the `followuprequests` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
- [{:keys [params]}]
- (do (db/create-followuprequest! params)))
-
-(defn
- create-gender!
- "Auto-generated method to insert one record to the `genders` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
- [{:keys [params]}]
- (do (db/create-gender! params)))
-
-(defn
- create-intention!
- "Auto-generated method to insert one record to the `intentions` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
- [{:keys [params]}]
- (do (db/create-intention! params)))
-
-(defn
- create-issue!
- "Auto-generated method to insert one record to the `issues` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
- [{:keys [params]}]
- (do (db/create-issue! params)))
-
-(defn
- create-option!
- "Auto-generated method to insert one record to the `options` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
- [{:keys [params]}]
- (do (db/create-option! params)))
-
-(defn
- create-role!
- "Auto-generated method to insert one record to the `roles` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
- [{:keys [params]}]
- (do (db/create-role! params)))
-
-(defn
- create-team!
- "Auto-generated method to insert one record to the `teams` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
- [{:keys [params]}]
- (do (db/create-team! params)))
-
-(defn
- create-visit!
- "Auto-generated method to insert one record to the `visits` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
- [{:keys [params]}]
- (do (db/create-visit! params)))
-
-(defn
- delete-address!
- "Auto-generated method to delete one record from the `addresses` table. Expects the following key(s) to be present in `params`: ``."
- [{:keys [params]}]
- (do (db/delete-address! params))
- (response/found "/"))
-
-(defn
- delete-authority!
- "Auto-generated method to delete one record from the `authorities` table. Expects the following key(s) to be present in `params`: ``."
- [{:keys [params]}]
- (do (db/delete-authority! params))
- (response/found "/"))
-
-(defn
- delete-canvasser!
- "Auto-generated method to delete one record from the `canvassers` table. Expects the following key(s) to be present in `params`: ``."
- [{:keys [params]}]
- (do (db/delete-canvasser! params))
- (response/found "/"))
-
-(defn
- delete-district!
- "Auto-generated method to delete one record from the `districts` table. Expects the following key(s) to be present in `params`: ``."
- [{:keys [params]}]
- (do (db/delete-district! params))
- (response/found "/"))
-
-(defn
- delete-dwelling!
- "Auto-generated method to delete one record from the `dwellings` table. Expects the following key(s) to be present in `params`: ``."
- [{:keys [params]}]
- (do (db/delete-dwelling! params))
- (response/found "/"))
-
-(defn
- delete-elector!
- "Auto-generated method to delete one record from the `electors` table. Expects the following key(s) to be present in `params`: ``."
- [{:keys [params]}]
- (do (db/delete-elector! params))
- (response/found "/"))
-
-(defn
- delete-followupaction!
- "Auto-generated method to delete one record from the `followupactions` table. Expects the following key(s) to be present in `params`: ``."
- [{:keys [params]}]
- (do (db/delete-followupaction! params))
- (response/found "/"))
-
-(defn
- delete-followupmethod!
- "Auto-generated method to delete one record from the `followupmethods` table. Expects the following key(s) to be present in `params`: ``."
- [{:keys [params]}]
- (do (db/delete-followupmethod! params))
- (response/found "/"))
-
-(defn
- delete-followuprequest!
- "Auto-generated method to delete one record from the `followuprequests` table. Expects the following key(s) to be present in `params`: ``."
- [{:keys [params]}]
- (do (db/delete-followuprequest! params))
- (response/found "/"))
-
-(defn
- delete-gender!
- "Auto-generated method to delete one record from the `genders` table. Expects the following key(s) to be present in `params`: ``."
- [{:keys [params]}]
- (do (db/delete-gender! params))
- (response/found "/"))
-
-(defn
- delete-intention!
- "Auto-generated method to delete one record from the `intentions` table. Expects the following key(s) to be present in `params`: ``."
- [{:keys [params]}]
- (do (db/delete-intention! params))
- (response/found "/"))
-
-(defn
- delete-issue!
- "Auto-generated method to delete one record from the `issues` table. Expects the following key(s) to be present in `params`: ``."
- [{:keys [params]}]
- (do (db/delete-issue! params))
- (response/found "/"))
-
-(defn
- delete-option!
- "Auto-generated method to delete one record from the `options` table. Expects the following key(s) to be present in `params`: ``."
- [{:keys [params]}]
- (do (db/delete-option! params))
- (response/found "/"))
-
-(defn
- delete-role!
- "Auto-generated method to delete one record from the `roles` table. Expects the following key(s) to be present in `params`: ``."
- [{:keys [params]}]
- (do (db/delete-role! params))
- (response/found "/"))
-
-(defn
- delete-team!
- "Auto-generated method to delete one record from the `teams` table. Expects the following key(s) to be present in `params`: ``."
- [{:keys [params]}]
- (do (db/delete-team! params))
- (response/found "/"))
-
-(defn
- delete-visit!
- "Auto-generated method to delete one record from the `visits` table. Expects the following key(s) to be present in `params`: ``."
- [{:keys [params]}]
- (do (db/delete-visit! params))
- (response/found "/"))
-
-(defn
- get-address
- "Auto-generated method to select one record from the `addresses` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-address params)))
-
-(defn
- get-authority
- "Auto-generated method to select one record from the `authorities` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-authority params)))
-
-(defn
- get-canvasser
- "Auto-generated method to select one record from the `canvassers` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-canvasser params)))
-
-(defn
- get-canvasser-by-username
- "Auto-generated method to select one record from the `canvassers` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-canvasser-by-username params)))
-
-(defn
- get-district
- "Auto-generated method to select one record from the `districts` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-district params)))
-
-(defn
- get-dwelling
- "Auto-generated method to select one record from the `dwellings` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-dwelling params)))
-
-(defn
- get-elector
- "Auto-generated method to select one record from the `electors` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-elector params)))
-
-(defn
- get-followupaction
- "Auto-generated method to select one record from the `followupactions` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-followupaction params)))
-
-(defn
- get-followupmethod
- "Auto-generated method to select one record from the `followupmethods` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-followupmethod params)))
-
-(defn
- get-followuprequest
- "Auto-generated method to select one record from the `followuprequests` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-followuprequest params)))
-
-(defn
- get-gender
- "Auto-generated method to select one record from the `genders` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-gender params)))
-
-(defn
- get-intention
- "Auto-generated method to select one record from the `intentions` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-intention params)))
-
-(defn
- get-issue
- "Auto-generated method to select one record from the `issues` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-issue params)))
-
-(defn
- get-option
- "Auto-generated method to select one record from the `options` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-option params)))
-
-(defn
- get-role
- "Auto-generated method to select one record from the `roles` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-role params)))
-
-(defn
- get-role-by-name
- "Auto-generated method to select one record from the `roles` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-role-by-name params)))
-
-(defn
- get-team
- "Auto-generated method to select one record from the `teams` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-team params)))
-
-(defn
- get-visit
- "Auto-generated method to select one record from the `visits` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/get-visit params)))
-
-(defn
- list-addresses
- "Auto-generated method to select all records from the `addresses` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/list-addresses params)))
-
-(defn
- list-addresses-by-district
- [{:keys [params]}]
- (do (db/list-addresses-by-district params)))
-
-(defn
- list-authorities
- "Auto-generated method to select all records from the `authorities` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/list-authorities params)))
-
-(defn
- list-canvassers
- "Auto-generated method to select all records from the `canvassers` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/list-canvassers params)))
-
-(defn
- list-canvassers-by-address
- [{:keys [params]}]
- (do (db/list-canvassers-by-address params)))
-
-(defn
- list-canvassers-by-authority
- [{:keys [params]}]
- (do (db/list-canvassers-by-authority params)))
-
-(defn
- list-canvassers-by-elector
- [{:keys [params]}]
- (do (db/list-canvassers-by-elector params)))
-
-(defn
- list-canvassers-by-role
- [{:keys [params]}]
- (do (db/list-canvassers-by-role params)))
-
-(defn
- list-districts
- "Auto-generated method to select all records from the `districts` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/list-districts params)))
-
-(defn
- list-dwellings
- "Auto-generated method to select all records from the `dwellings` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/list-dwellings params)))
-
-(defn
- list-dwellings-by-address
- [{:keys [params]}]
- (do (db/list-dwellings-by-address params)))
-
-(defn
- list-electors
- "Auto-generated method to select all records from the `electors` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/list-electors params)))
-
-(defn
- list-electors-by-dwelling
- [{:keys [params]}]
- (do (db/list-electors-by-dwelling params)))
-
-(defn
- list-electors-by-gender
- [{:keys [params]}]
- (do (db/list-electors-by-gender params)))
-
-(defn
- list-followupactions
- "Auto-generated method to select all records from the `followupactions` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/list-followupactions params)))
-
-(defn
- list-followupactions-by-canvasser
- [{:keys [params]}]
- (do (db/list-followupactions-by-canvasser params)))
-
-(defn
- list-followupactions-by-followuprequest
- [{:keys [params]}]
- (do (db/list-followupactions-by-followuprequest params)))
-
-(defn
- list-followupmethods
- "Auto-generated method to select all records from the `followupmethods` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/list-followupmethods params)))
-
-(defn
- list-followuprequests
- "Auto-generated method to select all records from the `followuprequests` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/list-followuprequests params)))
-
-(defn
- list-followuprequests-by-elector
- [{:keys [params]}]
- (do (db/list-followuprequests-by-elector params)))
-
-(defn
- list-followuprequests-by-followupmethod
- [{:keys [params]}]
- (do (db/list-followuprequests-by-followupmethod params)))
-
-(defn
- list-followuprequests-by-issue
- [{:keys [params]}]
- (do (db/list-followuprequests-by-issue params)))
-
-(defn
- list-followuprequests-by-visit
- [{:keys [params]}]
- (do (db/list-followuprequests-by-visit params)))
-
-(defn
- list-genders
- "Auto-generated method to select all records from the `genders` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/list-genders params)))
-
-(defn
- list-intentions
- "Auto-generated method to select all records from the `intentions` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/list-intentions params)))
-
-(defn
- list-intentions-by-elector
- [{:keys [params]}]
- (do (db/list-intentions-by-elector params)))
-
-(defn
- list-intentions-by-option
- [{:keys [params]}]
- (do (db/list-intentions-by-option params)))
-
-(defn
- list-intentions-by-visit
- [{:keys [params]}]
- (do (db/list-intentions-by-visit params)))
-
-(defn
- list-issues
- "Auto-generated method to select all records from the `issues` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/list-issues params)))
-
-(defn
- list-options
- "Auto-generated method to select all records from the `options` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/list-options params)))
-
-(defn
- list-roles
- "Auto-generated method to select all records from the `roles` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/list-roles params)))
-
-(defn
- list-roles-by-canvasser
- [{:keys [params]}]
- (do (db/list-roles-by-canvasser params)))
-
-(defn
- list-teams
- "Auto-generated method to select all records from the `teams` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/list-teams params)))
-
-(defn
- list-teams-by-canvasser
- [{:keys [params]}]
- (do (db/list-teams-by-canvasser params)))
-
-(defn
- list-teams-by-district
- [{:keys [params]}]
- (do (db/list-teams-by-district params)))
-
-(defn
- list-visits
- "Auto-generated method to select all records from the `visits` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/list-visits params)))
-
-(defn
- list-visits-by-address
- [{:keys [params]}]
- (do (db/list-visits-by-address params)))
-
-(defn
- list-visits-by-canvasser
- [{:keys [params]}]
- (do (db/list-visits-by-canvasser params)))
-
-(defn
- search-strings-address
- "Auto-generated method to select all records from the `addresses` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/search-strings-address params)))
-
-(defn
- search-strings-authority
- "Auto-generated method to select all records from the `authorities` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/search-strings-authority params)))
-
-(defn
- search-strings-canvasser
- "Auto-generated method to select all records from the `canvassers` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/search-strings-canvasser params)))
-
-(defn
- search-strings-district
- "Auto-generated method to select all records from the `districts` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/search-strings-district params)))
-
-(defn
- search-strings-dwelling
- "Auto-generated method to select all records from the `dwellings` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/search-strings-dwelling params)))
-
-(defn
- search-strings-elector
- "Auto-generated method to select all records from the `electors` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/search-strings-elector params)))
-
-(defn
- search-strings-followupaction
- "Auto-generated method to select all records from the `followupactions` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/search-strings-followupaction params)))
-
-(defn
- search-strings-followupmethod
- "Auto-generated method to select all records from the `followupmethods` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/search-strings-followupmethod params)))
-
-(defn
- search-strings-followuprequest
- "Auto-generated method to select all records from the `followuprequests` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/search-strings-followuprequest params)))
-
-(defn
- search-strings-gender
- "Auto-generated method to select all records from the `genders` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/search-strings-gender params)))
-
-(defn
- search-strings-intention
- "Auto-generated method to select all records from the `intentions` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/search-strings-intention params)))
-
-(defn
- search-strings-issue
- "Auto-generated method to select all records from the `issues` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/search-strings-issue params)))
-
-(defn
- search-strings-option
- "Auto-generated method to select all records from the `options` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/search-strings-option params)))
-
-(defn
- search-strings-role
- "Auto-generated method to select all records from the `roles` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/search-strings-role params)))
-
-(defn
- search-strings-team
- "Auto-generated method to select all records from the `teams` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/search-strings-team params)))
-
-(defn
- search-strings-visit
- "Auto-generated method to select all records from the `visits` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
- [{:keys [params]}]
- (do (db/search-strings-visit params)))
-
-(defn
- update-address!
- "Auto-generated method to update one record in the `addresses` table. Expects the following key(s) to be present in `params`: `(nil)`."
- [{:keys [params]}]
- (do (db/update-address! params))
- (response/found "/"))
-
-(defn
- update-authority!
- "Auto-generated method to update one record in the `authorities` table. Expects the following key(s) to be present in `params`: `(nil)`."
- [{:keys [params]}]
- (do (db/update-authority! params))
- (response/found "/"))
-
-(defn
- update-canvasser!
- "Auto-generated method to update one record in the `canvassers` table. Expects the following key(s) to be present in `params`: `(nil)`."
- [{:keys [params]}]
- (do (db/update-canvasser! params))
- (response/found "/"))
-
-(defn
- update-district!
- "Auto-generated method to update one record in the `districts` table. Expects the following key(s) to be present in `params`: `(nil)`."
- [{:keys [params]}]
- (do (db/update-district! params))
- (response/found "/"))
-
-(defn
- update-dwelling!
- "Auto-generated method to update one record in the `dwellings` table. Expects the following key(s) to be present in `params`: `(nil)`."
- [{:keys [params]}]
- (do (db/update-dwelling! params))
- (response/found "/"))
-
-(defn
- update-elector!
- "Auto-generated method to update one record in the `electors` table. Expects the following key(s) to be present in `params`: `(nil)`."
- [{:keys [params]}]
- (do (db/update-elector! params))
- (response/found "/"))
-
-(defn
- update-followupaction!
- "Auto-generated method to update one record in the `followupactions` table. Expects the following key(s) to be present in `params`: `(nil)`."
- [{:keys [params]}]
- (do (db/update-followupaction! params))
- (response/found "/"))
-
-(defn
- update-followuprequest!
- "Auto-generated method to update one record in the `followuprequests` table. Expects the following key(s) to be present in `params`: `(nil)`."
- [{:keys [params]}]
- (do (db/update-followuprequest! params))
- (response/found "/"))
-
-(defn
- update-intention!
- "Auto-generated method to update one record in the `intentions` table. Expects the following key(s) to be present in `params`: `(nil)`."
- [{:keys [params]}]
- (do (db/update-intention! params))
- (response/found "/"))
-
-(defn
- update-issue!
- "Auto-generated method to update one record in the `issues` table. Expects the following key(s) to be present in `params`: `(nil)`."
- [{:keys [params]}]
- (do (db/update-issue! params))
- (response/found "/"))
-
-(defn
- update-role!
- "Auto-generated method to update one record in the `roles` table. Expects the following key(s) to be present in `params`: `(nil)`."
- [{:keys [params]}]
- (do (db/update-role! params))
- (response/found "/"))
-
-(defn
- update-team!
- "Auto-generated method to update one record in the `teams` table. Expects the following key(s) to be present in `params`: `(nil)`."
- [{:keys [params]}]
- (do (db/update-team! params))
- (response/found "/"))
-
-(defn
- update-visit!
- "Auto-generated method to update one record in the `visits` table. Expects the following key(s) to be present in `params`: `(nil)`."
- [{:keys [params]}]
- (do (db/update-visit! params))
- (response/found "/"))
-
diff --git a/src/clj/youyesyet/routes/home.clj b/src/clj/youyesyet/routes/home.clj
index 165eb45..86b2729 100644
--- a/src/clj/youyesyet/routes/home.clj
+++ b/src/clj/youyesyet/routes/home.clj
@@ -6,8 +6,9 @@
             [noir.response :as nresponse]
             [noir.util.route :as route]
             [ring.util.http-response :refer [content-type ok]]
-            [youyesyet.layout :as layout]
+            [youyesyet.config :refer [env]]
             [youyesyet.db.core :as db-core]
+            [youyesyet.layout :as layout]
             [youyesyet.oauth :as oauth]
             [compojure.core :refer [defroutes GET POST]]
             [ring.util.http-response :as response]
@@ -41,7 +42,7 @@
 
 
 (defn about-page []
-  (layout/render "about.html" {}))
+  (layout/render "about.html" {} {:title (str "About " (:site-title env))}))
 
 
 (defn call-me-page [request]
@@ -53,7 +54,7 @@
     (layout/render "call-me.html" (:session request)
                    {:title "Please call me!"
                     ;; TODO: Issues need to be fetched from the database
-                    :concerns nil})))
+                    :concerns (db-core/list-issues db-core/*db* {})})))
 
 
 (defn roles-page [request]
@@ -72,7 +73,7 @@
 
 
 (defn home-page []
-  (layout/render "home.html" {} {:title "You Yes Yet?"}))
+  (layout/render "home.html" {} {:title "You yes yet?"}))
 
 
 (defn login-page
diff --git a/youyesyet.adl.xml b/youyesyet.adl.xml
index 266363f..a9ab863 100644
--- a/youyesyet.adl.xml
+++ b/youyesyet.adl.xml
@@ -81,7 +81,7 @@
       generally.</documentation>
   </group>
 
-  <entity name="electors" magnitude="6">
+  <entity name="electors" magnitude="6" volatility="5">
     <documentation>All electors known to the system; electors are people believed to be entitled to vote in the current campaign.</documentation>
     <key>
       <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
@@ -92,7 +92,7 @@
       <prompt prompt="name" locale="en-GB"/>
     </property>
     <property required="true" type="entity" name="dwelling_id" column="dwelling_id" entity="dwellings" farkey="id">
-      <prompt prompt="Flat" locale="en-GB"/>
+      <prompt prompt="home" locale="en-GB"/>
     </property>
     <property size="16" type="string" name="phone" column="phone" distinct="user">
       <prompt prompt="phone" locale="en-GB"/>
@@ -113,7 +113,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <entity name="genders" magnitude="1">
+  <entity name="genders" magnitude="1" volatility="6">
     <documentation>All genders which may be assigned to electors.</documentation>
     <key>
       <property name="id" type="string" size="32" distinct="all">
@@ -129,7 +129,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <entity name="dwellings" magnitude="6">
+  <entity name="dwellings" magnitude="6" volatility="6">
     <documentation>All dwellings within addresses in the system; a dwelling is a
       house, flat or appartment in which electors live. Every address should have
       at least one dwelling; essentially, an address maps onto a street door and
@@ -154,7 +154,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <entity name="addresses" magnitude="6">
+  <entity name="addresses" magnitude="6" volatility="6">
     <documentation>Addresses of all buildings which contain dwellings.</documentation>
     <key>
       <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
@@ -220,7 +220,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <entity name="visits" magnitude="7">
+  <entity name="visits" magnitude="7" volatility="2">
     <documentation>All visits made by canvassers to dwellings in which opinions were recorded.</documentation>
     <key>
       <property required="true" type="integer" name="id" column="id" distinct="system">
@@ -256,7 +256,7 @@
     <permission permission="read" group="issueeditors"/>
     <permission permission="all" group="admin"/>
   </entity>
-  <entity name="authorities" magnitude="2">
+  <entity name="authorities" magnitude="2" volatility="7">
     <documentation>Authorities which may authenticate canvassers to the system.</documentation>
     <key>
       <property required="true" type="string" name="id" column="id" size="32" distinct="all">
@@ -289,7 +289,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <entity name="issues" magnitude="1">
+  <entity name="issues" magnitude="1" volatility="3">
     <documentation>Issues believed to be of interest to electors, about which they may have questions.</documentation>
     <key>
       <property required="true" type="string" name="id" column="id" size="32" immutable="true" distinct="all">
@@ -311,7 +311,7 @@
     <permission group="issueeditors" permission="edit"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <entity name="intentions" magnitude="6">
+  <entity name="intentions" magnitude="6" volatility="2">
     <documentation>Intentions of electors to vote for options elicited in visits.</documentation>
     <property required="true" type="entity" entity="visits" farkey="id" name="visit_id"
       column="visit_id">
@@ -344,7 +344,7 @@
     <permission group="issueeditors" permission="none"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <entity name="canvassers" magnitude="5">
+  <entity name="canvassers" magnitude="5" volatility="4">
     <documentation>Primary users of the system: those actually interviewing electors.</documentation>
     <key>
       <property type="integer" name="id" column="id" distinct="system" immutable="true">
@@ -400,7 +400,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <entity name="followuprequests" magnitude="7">
+  <entity name="followuprequests" magnitude="7" volatility="2">
     <documentation>Requests for a followup with an issue expert</documentation>
     <key>
       <property required="true" type="integer" name="id" column="id" distinct="system">
@@ -432,7 +432,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <entity name="roles" magnitude="1">
+  <entity name="roles" magnitude="1" volatility="7">
     <documentation>A role (essentially, the same as a group, but application layer rather than database layer) of which a user may be a member.</documentation>
     <key>
       <property type="integer" name="id" column="id" immutable="true" distinct="system">
@@ -454,7 +454,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <entity name="teams" magnitude="4">
+  <entity name="teams" magnitude="4" volatility="4">
     <key>
       <property type="integer" name="id" column="id" distinct="system" immutable="true">
         <prompt prompt="id" locale="en-GB"/>
@@ -499,7 +499,7 @@
     <permission permission="read" group="issueeditors"/>
     <permission permission="all" group="admin"/>
   </entity>
-  <entity name="districts" magnitude="4">
+  <entity name="districts" magnitude="4" volatility="7">
     <documentation>Electoral districts: TODO: Shape (polygon) information will need to be added, for use in maps.</documentation>
     <key>
       <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
@@ -520,7 +520,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <entity name="followupactions" magnitude="7">
+  <entity name="followupactions" magnitude="7" volatility="0">
     <documentation>Actions taken on followup requests.</documentation>
     <key>
       <property required="true" type="integer" name="id" column="id" distinct="system">
@@ -555,7 +555,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <entity name="options" magnitude="1">
+  <entity name="options" magnitude="1" volatility="7">
     <documentation>Options in the election or referendum being canvassed on</documentation>
     <key>
       <property required="true" type="string" name="id" column="id" size="32" immutable="true" distinct="all">
@@ -571,7 +571,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <entity name="followupmethods" magnitude="1">
+  <entity name="followupmethods" magnitude="1" volatility="7">
     <key>
       <property required="true" type="string" size="32" name="id" column="id" immutable="true" distinct="all">
         <prompt prompt="id" locale="en-GB"/>
diff --git a/youyesyet.canonical.adl.xml b/youyesyet.canonical.adl.xml
index 48a3140..1034995 100644
--- a/youyesyet.canonical.adl.xml
+++ b/youyesyet.canonical.adl.xml
@@ -89,9 +89,9 @@
       generally.</documentation>
   </group>
   <!--
-			entity electors already has a key - not generating one
-		-->
-  <entity table="electors" name="electors" magnitude="6">
+    entity electors already has a key - not generating one
+    -->
+  <entity table="electors" name="electors" magnitude="6" volatility="5">
     <documentation>All electors known to the system; electors are people believed to be entitled to vote in the current campaign.</documentation>
     <key>
       <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
@@ -123,9 +123,9 @@
     <permission group="admin" permission="all"/>
   </entity>
   <!--
-			entity genders already has a key - not generating one
-		-->
-  <entity table="genders" name="genders" magnitude="1">
+    entity genders already has a key - not generating one
+    -->
+  <entity table="genders" name="genders" magnitude="1" volatility="6">
     <documentation>All genders which may be assigned to electors.</documentation>
     <key>
       <property name="id" type="string" size="32" distinct="all">
@@ -142,9 +142,9 @@
     <permission group="admin" permission="all"/>
   </entity>
   <!--
-			entity dwellings already has a key - not generating one
-		-->
-  <entity table="dwellings" name="dwellings" magnitude="6">
+    entity dwellings already has a key - not generating one
+    -->
+  <entity table="dwellings" name="dwellings" magnitude="6" volatility="6">
     <documentation>All dwellings within addresses in the system; a dwelling is a
       house, flat or appartment in which electors live. Every address should have
       at least one dwelling; essentially, an address maps onto a street door and
@@ -170,9 +170,9 @@
     <permission group="admin" permission="all"/>
   </entity>
   <!--
-			entity addresses already has a key - not generating one
-		-->
-  <entity table="addresses" name="addresses" magnitude="6">
+    entity addresses already has a key - not generating one
+    -->
+  <entity table="addresses" name="addresses" magnitude="6" volatility="6">
     <documentation>Addresses of all buildings which contain dwellings.</documentation>
     <key>
       <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
@@ -239,9 +239,9 @@
     <permission group="admin" permission="all"/>
   </entity>
   <!--
-			entity visits already has a key - not generating one
-		-->
-  <entity table="visits" name="visits" magnitude="7">
+    entity visits already has a key - not generating one
+    -->
+  <entity table="visits" name="visits" magnitude="7" volatility="2">
     <documentation>All visits made by canvassers to dwellings in which opinions were recorded.</documentation>
     <key>
       <property required="true" type="integer" name="id" column="id" distinct="system">
@@ -276,9 +276,9 @@
     <permission permission="all" group="admin"/>
   </entity>
   <!--
-			entity authorities already has a key - not generating one
-		-->
-  <entity table="authorities" name="authorities" magnitude="2">
+    entity authorities already has a key - not generating one
+    -->
+  <entity table="authorities" name="authorities" magnitude="2" volatility="7">
     <documentation>Authorities which may authenticate canvassers to the system.</documentation>
     <key>
       <property required="true" type="string" name="id" column="id" size="32" distinct="all">
@@ -305,9 +305,9 @@
     <permission group="admin" permission="all"/>
   </entity>
   <!--
-			entity issues already has a key - not generating one
-		-->
-  <entity table="issues" name="issues" magnitude="1">
+    entity issues already has a key - not generating one
+    -->
+  <entity table="issues" name="issues" magnitude="1" volatility="3">
     <documentation>Issues believed to be of interest to electors, about which they may have questions.</documentation>
     <key>
       <property required="true" type="string" name="id" column="id" size="32" immutable="true" distinct="all">
@@ -332,7 +332,7 @@
   <!--
 			entity intentions has no key - generating one
 		-->
-  <entity table="intentions" name="intentions" magnitude="6">
+  <entity table="intentions" name="intentions" magnitude="6" volatility="0">
     <documentation>Intentions of electors to vote for options elicited in visits.</documentation>
     <key>
       <property type="integer" distinct="system" required="true" name="Id">
@@ -400,9 +400,9 @@
     </form>
   </entity>
   <!--
-			entity canvassers already has a key - not generating one
-		-->
-  <entity table="canvassers" name="canvassers" magnitude="5">
+    entity canvassers already has a key - not generating one
+    -->
+  <entity table="canvassers" name="canvassers" magnitude="5" volatility="4">
     <documentation>Primary users of the system: those actually interviewing electors.</documentation>
     <key>
       <property type="integer" name="id" column="id" distinct="system" immutable="true">
@@ -418,10 +418,10 @@
     <property type="entity" name="elector_id" column="elector_id" entity="electors" farkey="id">
       <prompt prompt="elector_id" locale="en-GB"/>
     </property>
-    <property required="true" type="entity" name="address_id" column="address_id" entity="addresses" farkey="id">
+    <property required="true" type="entity" name="address_id" column="address_id" entity="addresses" farkey="id" distinct="user">
       <prompt prompt="address_id" locale="en-GB"/>
     </property>
-    <property type="string" name="phone" column="phone" size="16">
+    <property type="string" name="phone" column="phone" size="16" distinct="user">
       <prompt prompt="phone" locale="en-GB"/>
     </property>
     <property type="string" name="email" column="email" size="128" distinct="user">
@@ -457,9 +457,9 @@
     <permission group="admin" permission="all"/>
   </entity>
   <!--
-			entity followuprequests already has a key - not generating one
-		-->
-  <entity table="followuprequests" name="followuprequests" magnitude="7">
+    entity followuprequests already has a key - not generating one
+    -->
+  <entity table="followuprequests" name="followuprequests" magnitude="7" volatility="2">
     <documentation>Requests for a followup with an issue expert</documentation>
     <key>
       <property required="true" type="integer" name="id" column="id" distinct="system">
@@ -488,9 +488,9 @@
     <permission group="admin" permission="all"/>
   </entity>
   <!--
-			entity roles already has a key - not generating one
-		-->
-  <entity table="roles" name="roles" magnitude="1">
+    entity roles already has a key - not generating one
+    -->
+  <entity table="roles" name="roles" magnitude="1" volatility="7">
     <documentation>A role (essentially, the same as a group, but application layer rather than database layer) of which a user may be a member.</documentation>
     <key>
       <property type="integer" name="id" column="id" immutable="true" distinct="system">
@@ -513,9 +513,9 @@
     <permission group="admin" permission="all"/>
   </entity>
   <!--
-			entity teams already has a key - not generating one
-		-->
-  <entity table="teams" name="teams" magnitude="4">
+    entity teams already has a key - not generating one
+    -->
+  <entity table="teams" name="teams" magnitude="4" volatility="4">
     <key>
       <property type="integer" name="id" column="id" distinct="system" immutable="true">
         <prompt prompt="id" locale="en-GB"/>
@@ -560,9 +560,9 @@
     <permission permission="all" group="admin"/>
   </entity>
   <!--
-			entity districts already has a key - not generating one
-		-->
-  <entity table="districts" name="districts" magnitude="4">
+    entity districts already has a key - not generating one
+    -->
+  <entity table="districts" name="districts" magnitude="4" volatility="7">
     <documentation>Electoral districts: TODO: Shape (polygon) information will need to be added, for use in maps.</documentation>
     <key>
       <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
@@ -584,9 +584,9 @@
     <permission group="admin" permission="all"/>
   </entity>
   <!--
-			entity followupactions already has a key - not generating one
-		-->
-  <entity table="followupactions" name="followupactions" magnitude="7">
+    entity followupactions already has a key - not generating one
+    -->
+  <entity table="followupactions" name="followupactions" magnitude="7" volatility="0">
     <documentation>Actions taken on followup requests.</documentation>
     <key>
       <property required="true" type="integer" name="id" column="id" distinct="system">
@@ -620,9 +620,9 @@
     <permission group="admin" permission="all"/>
   </entity>
   <!--
-			entity options already has a key - not generating one
-		-->
-  <entity table="options" name="options" magnitude="1">
+    entity options already has a key - not generating one
+    -->
+  <entity table="options" name="options" magnitude="1" volatility="7">
     <documentation>Options in the election or referendum being canvassed on</documentation>
     <key>
       <property required="true" type="string" name="id" column="id" size="32" immutable="true" distinct="all">
@@ -639,9 +639,9 @@
     <permission group="admin" permission="all"/>
   </entity>
   <!--
-			entity followupmethods already has a key - not generating one
-		-->
-  <entity table="followupmethods" name="followupmethods" magnitude="1">
+    entity followupmethods already has a key - not generating one
+    -->
+  <entity table="followupmethods" name="followupmethods" magnitude="1" volatility="7">
     <key>
       <property required="true" type="string" size="32" name="id" column="id" immutable="true" distinct="all">
         <prompt prompt="id" locale="en-GB"/>