Merge remote-tracking branch 'origin/feature/28' into feature/28

2018-06-03 08:54:50 +01:00 · 2018-06-03 08:54:50 +01:00 · ad8563d668
parent cf1eb70748 f86c5cffe6
commit ad8563d668
10 changed files with 1904 additions and 907 deletions
--- a/doc/specification/entity-relationship-diagram.svg
+++ b/doc/specification/entity-relationship-diagram.svg
@ -14,7 +14,7 @@
   viewBox="0 0 1052.3622 744.09448"
   id="svg2"
   version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
   sodipodi:docname="entity-relationship-diagram.svg">
  <defs
     id="defs4" />
@ -32,9 +32,9 @@
     inkscape:current-layer="layer1"
     showgrid="true"
     inkscape:window-width="1920"
-     inkscape:window-height="1031"
+     inkscape:window-height="1043"
-     inkscape:window-x="0"
+     inkscape:window-x="1920"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
     inkscape:window-maximized="1">
    <inkscape:grid
       type="xygrid"
@ -66,68 +66,59 @@
       y="312.36218" />
    <text
       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="36.365494"
-       y="354.3468"
+       y="335.1539"
-       id="text4136"
+       id="text4136"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4138"
         x="36.365494"
-         y="354.3468" /></text>
+         y="335.1539"
         style="font-size:20px;line-height:1.25"> </tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="470.03485"
+       x="117.1777"
-       y="379.60062"
+       y="360.40771"
-       id="text4140"
+       id="text4140"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4142"
-         x="470.03485"
+         x="117.1777"
-         y="379.60062"
+         y="360.40771"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:'Arial Bold'">YouYesYet: Entity Relationship Diagram</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial Bold'">YouYesYet: Entity Relationship Diagram</tspan></text>
    <g
       id="g4382">
      <rect
         y="430.84955"
         x="48.459385"
         height="60"
         width="100"
         id="rect4146"
         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
      <text
         sodipodi:linespacing="125%"
         id="text4148"
         y="460.84955"
         x="58.459385"
         style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
         xml:space="preserve"><tspan
           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial"
           y="460.84955"
           x="58.459385"
           id="tspan4150"
           sodipodi:role="line">District</tspan></text>
    </g>
    <rect
       y="553.07794"
       x="220.18532"
       y="411.65665" />
    <text
       xml:space="preserve"
       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="230.18532"
       y="441.65665"
       id="text4148"><tspan
         sodipodi:role="line"
         id="tspan4150"
         x="230.18532"
         y="441.65665"
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial">District</tspan></text>
    <rect
       y="533.88507"
       x="220.18532"
       height="60"
       width="100"
       id="rect4152"
       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
    <text
       sodipodi:linespacing="125%"
       id="text4154"
       y="583.078"
       x="230.18532"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial"
-         y="583.078"
+         y="563.88513"
         x="230.18532"
         id="tspan4156"
-         sodipodi:role="line">Dwelling</tspan></text>
+         sodipodi:role="line">Address</tspan></text>
    <rect
       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
       id="rect4158"
@ -137,16 +128,15 @@
       y="672.276" />
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="230.18532"
-       y="702.276"
+       y="683.08313"
-       id="text4160"
+       id="text4160"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4162"
         x="230.18532"
-         y="702.276"
+         y="683.08313"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial">Elector</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial">Elector</tspan></text>
    <rect
       y="672.276"
       x="732.33264"
@ -155,29 +145,28 @@
       id="rect4164"
       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
    <text
       sodipodi:linespacing="125%"
       id="text4166"
       y="702.276"
       x="742.33264"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial"
-         y="702.276"
+         y="683.08313"
         x="742.33264"
         id="tspan4168"
         sodipodi:role="line">Canvasser</tspan></text>
    <flowRoot
       xml:space="preserve"
       id="flowRoot4170"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0.01%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
       transform="translate(0,19.192898)"><flowRegion
         id="flowRegion4172"><rect
           id="rect4174"
           width="150"
           height="100"
           x="20"
           y="174.09448" /></flowRegion><flowPara
-         id="flowPara4176" /></flowRoot>    <rect
+         id="flowPara4176"
         style="font-size:20px;line-height:1.25"> </flowPara></flowRoot>    <rect
       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
       id="rect4178"
       width="100"
@ -186,16 +175,15 @@
       y="553.07794" />
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="742.33264"
-       y="583.078"
+       y="563.88513"
-       id="text4180"
+       id="text4180"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4182"
         x="742.33264"
-         y="583.078"
+         y="563.88513"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial">Authority</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial">Authority</tspan></text>
    <rect
       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
       id="rect4184"
@ -205,16 +193,15 @@
       y="553.07794" />
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="400.90109"
-       y="583.078"
+       y="563.88513"
-       id="text4186"
+       id="text4186"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4188"
         x="400.90109"
-         y="583.078"
+         y="563.88513"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial">Visit</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial">Visit</tspan></text>
    <rect
       y="672.276"
       x="390.90109"
@ -223,14 +210,13 @@
       id="rect4190"
       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
    <text
       sodipodi:linespacing="125%"
       id="text4192"
       y="702.276"
       x="400.90109"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial"
-         y="702.276"
+         y="683.08313"
         x="400.90109"
         id="tspan4194"
         sodipodi:role="line">Intention</tspan></text>
@ -243,20 +229,19 @@
       y="794.50446" />
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="742.33264"
-       y="824.50446"
+       y="805.31158"
-       id="text4198"
+       id="text4198"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4200"
         x="742.33264"
-         y="824.50446"
+         y="805.31158"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial">Issue</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial">Issue</tspan><tspan
         sodipodi:role="line"
         x="742.33264"
-         y="843.25446"
+         y="824.06158"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial"
         id="tspan4208">Expertise</tspan></text>
    <rect
       y="917.74304"
@ -266,14 +251,13 @@
       id="rect4202"
       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
    <text
       sodipodi:linespacing="125%"
       id="text4204"
       y="947.74304"
       x="742.33264"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial"
-         y="947.74304"
+         y="928.55017"
         x="742.33264"
         id="tspan4206"
         sodipodi:role="line">Issue</tspan></text>
@ -285,19 +269,18 @@
       id="rect4221"
       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
    <text
       sodipodi:linespacing="125%"
       id="text4223"
       y="822.48413"
       x="230.18532"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial"
-         y="822.48413"
+         y="803.29126"
         x="230.18532"
         id="tspan4225"
         sodipodi:role="line">Followup</tspan><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial"
-         y="841.23413"
+         y="822.04126"
         x="230.18532"
         sodipodi:role="line"
         id="tspan4227">Request</tspan></text>
@ -310,21 +293,20 @@
       y="915.72272" />
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="230.18532"
-       y="945.72272"
+       y="926.52985"
-       id="text4231"
+       id="text4231"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4233"
         x="230.18532"
-         y="945.72272"
+         y="926.52985"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial">Followup</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial">Followup</tspan><tspan
         id="tspan4235"
         sodipodi:role="line"
         x="230.18532"
-         y="964.47272"
+         y="945.27985"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial">Action</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial">Action</tspan></text>
    <g
       id="g4243"
       transform="translate(170.18532,48.487322)">
@ -534,13 +516,12 @@
         id="rect4323"
         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
      <text
         sodipodi:linespacing="125%"
         id="text4325"
         y="683.08313"
         x="570.60675"
-         style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial"
           y="683.08313"
           x="570.60675"
           id="tspan4327"
@ -608,37 +589,36 @@
       sodipodi:nodetypes="ccc" />
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="472.0152"
-       y="413.67694"
+       y="394.48404"
-       id="text4361"
+       id="text4361"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4363"
         x="472.0152"
-         y="413.67694"
+         y="394.48404"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial"><tspan
   style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:'Arial Bold'"
   id="tspan4371">Version: </tspan>0.4</tspan><tspan
         sodipodi:role="line"
         x="472.0152"
-         y="432.42694"
+         y="419.48404"
         id="tspan4365"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial"><tspan
   style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:'Arial Bold'"
   id="tspan4373">Date: </tspan>20170401</tspan><tspan
         sodipodi:role="line"
         x="472.0152"
-         y="451.17694"
+         y="444.48404"
         id="tspan4367"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial"><tspan
   style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:'Arial Bold'"
   id="tspan4375">Author: </tspan>Simon Brooke</tspan><tspan
         sodipodi:role="line"
         x="472.0152"
-         y="469.92694"
+         y="469.48404"
         id="tspan4369"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:Arial;-inkscape-font-specification:Arial"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial"><tspan
   style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:'Arial Bold'"
   id="tspan4377">Copyright:</tspan> (c) 2016 Simon Brooke for Radical Independence Campaign</tspan></text>
    <path
@ -659,11 +639,10 @@
       inkscape:connector-curvature="0" />
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="670"
-       y="781.55505"
+       y="762.36218"
-       id="text4385"
+       id="text4385"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4387"
         x="670"
@ -671,11 +650,10 @@
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start">Introduced</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="530"
-       y="517.5119"
+       y="498.31903"
-       id="text4389"
+       id="text4389"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4391"
         x="530"
@ -683,70 +661,64 @@
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start">Visited</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="450"
-       y="651.55505"
+       y="632.36218"
-       id="text4393"
+       id="text4393"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4395"
         x="450"
-         y="651.55505"
+         y="632.36218"
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start">Recorded</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="49.187798"
+       x="130"
-       y="391.35205"
+       y="392.36221"
-       id="text4397"
+       id="text4397"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4399"
-         x="49.187798"
+         x="130"
-         y="391.35205"
+         y="392.36221"
         style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Bold Italic';text-align:start;writing-mode:lr-tb;text-anchor:start">Raised</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="790"
-       y="641.55505"
+       y="622.36218"
-       id="text4401"
+       id="text4401"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4403"
         x="790"
-         y="641.55505"
+         y="622.36218"
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start">Authenticates</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="790"
-       y="761.55505"
+       y="742.36218"
-       id="text4405"
+       id="text4405"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4407"
         x="790"
-         y="761.55505"
+         y="742.36218"
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start">Has</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="790"
-       y="881.55505"
+       y="862.36218"
-       id="text4409"
+       id="text4409"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4411"
         x="790"
-         y="881.55505"
+         y="862.36218"
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start">About</tspan></text>
    <text
       sodipodi:linespacing="125%"
       id="text4413"
       y="799.73273"
       x="337.45166"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       xml:space="preserve"><tspan
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start"
         y="799.73273"
@ -755,92 +727,80 @@
         sodipodi:role="line">About</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="280"
-       y="891.55505"
+       y="872.36218"
-       id="text4417"
+       id="text4417"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4419"
         x="280"
-         y="891.55505"
+         y="872.36218"
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start">Responded to</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="161.30452"
+       x="330"
-       y="480.12863"
+       y="702.36218"
-       id="text4421"
+       id="text4421"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4423"
-         x="161.30452"
+         x="330"
-         y="480.12863"
+         y="702.36218"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start">Contains</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start">Expressed</tspan></text>
         sodipodi:role="line"
         x="161.30452"
         y="492.62863"
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start"
         id="tspan4389" /></text>
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="280"
-       y="531.55505"
+       y="512.36218"
-       id="text4425"
+       id="text4425"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4427"
         x="280"
-         y="531.55505"
+         y="512.36218"
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start">Contains</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="280"
-       y="651.55505"
+       y="632.36218"
-       id="text4429"
+       id="text4429"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4431"
         x="280"
-         y="651.55505"
+         y="632.36218"
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start">Resides at</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="280"
-       y="761.55505"
+       y="742.36218"
-       id="text4433"
+       id="text4433"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4435"
         x="280"
-         y="761.55505"
+         y="742.36218"
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start">Requested</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="280"
-       y="1021.5551"
+       y="1002.3622"
-       id="text4441"
+       id="text4441"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4443"
         x="280"
-         y="1021.5551"
+         y="1002.3622"
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start">Performed</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="340"
-       y="571.55505"
+       y="552.36218"
-       id="text4445"
+       id="text4445"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4447"
         x="340"
-         y="571.55505"
+         y="552.36218"
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start">To</tspan></text>
    <path
       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@ -856,11 +816,10 @@
       y="672.276" />
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="908.88831"
-       y="701.55505"
+       y="682.36218"
-       id="text4285"
+       id="text4285"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4287"
         x="908.88831"
@ -882,47 +841,47 @@
       y="792.48413" />
    <text
       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="920"
-       y="581.55505"
+       y="562.36218"
-       id="text4302"
+       id="text4302"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4304"
         x="920"
-         y="581.55505" /></text>
+         y="562.36218"
         style="font-size:20px;line-height:1.25"> </tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:15px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="908.88831"
-       y="821.55505"
+       y="802.36218"
-       id="text4306"
+       id="text4306"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4308"
         x="908.88831"
-         y="821.55505"
+         y="802.36218"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial">Organiser-</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial">Organiser-</tspan><tspan
         sodipodi:role="line"
         x="908.88831"
-         y="840.30505"
+         y="821.11218"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial"
         id="tspan4310">ship</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="908.88831"
-       y="581.55505"
+       y="562.36218"
-       id="text4312"
+       id="text4312"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4314"
         x="908.88831"
-         y="581.55505">Team</tspan><tspan
+         y="562.36218"
         style="font-size:15px;line-height:1.25">Team</tspan><tspan
         sodipodi:role="line"
         x="908.88831"
-         y="600.30505"
+         y="581.11218"
-         id="tspan4385">Membership</tspan></text>
+         id="tspan4385"
         style="font-size:15px;line-height:1.25">Membership</tspan></text>
    <path
       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       d="m 830,691.55511 40,0 0,-110 30,0"
@ -974,11 +933,10 @@
       id="path4338"
       inkscape:connector-curvature="0" />
    <text
       sodipodi:linespacing="125%"
       id="text4340"
       y="762.56519"
       x="879.90356"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       xml:space="preserve"><tspan
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start"
         y="762.56519"
@ -987,11 +945,10 @@
         sodipodi:role="line">Has</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:125%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'URW Chancery L';-inkscape-font-specification:'URW Chancery L Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="879.90356"
-       y="640.33673"
+       y="621.14386"
-       id="text4344"
+       id="text4344"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4346"
         x="879.90356"
@ -999,28 +956,26 @@
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start">Has</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="960"
-       y="641.55505"
+       y="622.36218"
-       id="text4348"
+       id="text4348"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4350"
         x="960"
-         y="641.55505"
+         y="622.36218"
-         style="font-size:10px">of</tspan></text>
+         style="font-size:10px;line-height:1.25">of</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="960"
-       y="761.55505"
+       y="742.36218"
-       id="text4352"
+       id="text4352"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4354"
         x="960"
-         y="761.55505"
+         y="742.36218"
-         style="font-size:10px">of</tspan></text>
+         style="font-size:10px;line-height:1.25">of</tspan></text>
    <g
       id="g4375"
       transform="matrix(1,0,0,-1,171.72593,1625.9208)">
@ -1046,16 +1001,15 @@
    </g>
    <text
       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="450"
-       y="761.55505"
+       y="742.36218"
-       id="text4386"
+       id="text4386"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4388"
         x="450"
-         y="761.55505"
+         y="742.36218"
-         style="font-size:10px">For</tspan></text>
+         style="font-size:10px;line-height:1.25">For</tspan></text>
    <rect
       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
       id="rect4390"
@ -1065,19 +1019,20 @@
       y="672.276" />
    <text
       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="570"
-       y="701.55505"
+       y="682.36218"
-       id="text4394"
+       id="text4394"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4396"
         x="570"
-         y="701.55505">Role</tspan><tspan
+         y="682.36218"
         style="font-size:15px;line-height:1.25">Role</tspan><tspan
         sodipodi:role="line"
         x="570"
-         y="720.30505"
+         y="701.11218"
-         id="tspan4383">Membership</tspan></text>
+         id="tspan4383"
         style="font-size:15px;line-height:1.25">Membership</tspan></text>
    <g
       id="g4354"
       transform="translate(0,-222.73864)">
@ -1089,16 +1044,16 @@
         x="561.61688"
         y="774.30139" />
      <text
         sodipodi:linespacing="125%"
         id="text4398"
         y="802.36218"
         x="570"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
         xml:space="preserve"><tspan
           y="802.36218"
           x="570"
           id="tspan4400"
-           sodipodi:role="line">Role</tspan></text>
+           sodipodi:role="line"
           style="font-size:15px;line-height:1.25">Role</tspan></text>
    </g>
    <g
       id="g4338"
@ -1126,28 +1081,26 @@
       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
    <text
       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="690"
-       y="696.55505"
+       y="677.36218"
-       id="text4346"
+       id="text4346"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4348"
         x="690"
-         y="696.55505"
+         y="677.36218"
-         style="font-size:10px">Is</tspan></text>
+         style="font-size:10px;line-height:1.25">Is</tspan></text>
    <text
       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="619.09393"
-       y="650.43823"
+       y="631.24536"
-       id="text4350"
+       id="text4350"><tspan
       sodipodi:linespacing="125%"><tspan
         sodipodi:role="line"
         id="tspan4352"
         x="619.09393"
-         y="650.43823"
+         y="631.24536"
-         style="font-size:10px">Includes</tspan></text>
+         style="font-size:10px;line-height:1.25">Includes</tspan></text>
    <g
       id="g4359"
       transform="translate(341.43156,-222.73861)">
--- a/project.clj
+++ b/project.clj
@ -53,6 +53,7 @@
            [migratus-lein "0.4.2"]
            [org.clojars.punkisdead/lein-cucumber "1.0.5"]
            [lein-cljsbuild "1.1.4"]
            [lein-codox "0.10.3"]
            [lein-uberwar "0.2.0"]
            [lein-bower "0.5.1"]
            [lein-less "1.7.5"]
--- a/resources/migrations/20180408124500-reference-data.down.sql
+++ b/resources/migrations/20180408124500-reference-data.down.sql
@ -0,0 +1 @@
 alter table issues drop column current;
--- a/resources/migrations/20180408124500-reference-data.up.sql
+++ b/resources/migrations/20180408124500-reference-data.up.sql
@ -0,0 +1,2 @@
 alter table issues add column current boolean default true;
--- a/resources/migrations/20180526162051-dwellings.down.sql
+++ b/resources/migrations/20180526162051-dwellings.down.sql
@ -0,0 +1,8 @@
 alter table electors
  add column address_id references addresses on delete no action;
 update electors
  set address_id =
    (select address_id
       from dwellings
       where dwellings.id electors.dwelling_id);
--- a/resources/migrations/20180526162051-dwellings.up.sql
+++ b/resources/migrations/20180526162051-dwellings.up.sql
@ -0,0 +1,11 @@
 CREATE TABLE  dwellings
 (
  id INT NOT NULL PRIMARY KEY,
  address_id INT NOT NULL references addresses on delete no action,
  sub_address VARCHAR( 32)
 );
 alter table electors
  add column dwelling_id int references dwellings on delete no action;
 alter table electors drop column address_id;
--- a/resources/sql/queries.auto.sql
+++ b/resources/sql/queries.auto.sql
--- a/src/clj/youyesyet/routes/auto_json_routes.clj
+++ b/src/clj/youyesyet/routes/auto_json_routes.clj
@ -11,7 +11,7 @@
 (declare
- create-addresse
+ create-address
 create-authority
 create-canvasser
 create-district
@ -30,7 +30,7 @@
 create-teammembership
 create-teamorganisership
 create-visit
- delete-addresse
+ delete-address
 delete-authority
 delete-canvasser
 delete-district
@ -41,7 +41,7 @@
 delete-issue
 delete-option
 delete-visit
- get-addresse
+ get-address
 get-authority
 get-canvasser
 get-district
@ -61,7 +61,7 @@
 list-canvassers-by-elector
 list-districts
 list-electors
- list-electors-by-addresse
+ list-electors-by-address
 list-followupactions
 list-followupactions-by-canvasser
 list-followupactions-by-followuprequest
@ -96,9 +96,9 @@
 list-teams
 list-teams-by-district
 list-visits
- list-visits-by-addresse
+ list-visits-by-address
 list-visits-by-canvasser
- update-addresse
+ update-address
 update-canvasser
 update-district
 update-elector
@ -110,7 +110,7 @@
 (defroutes
 auto-rest-routes
- (POST "/json/auto/create-addresse" request (create-addresse request))
+ (POST "/json/auto/create-addresse" request (create-address request))
 (POST
  "/json/auto/create-authority"
  request
@ -162,7 +162,7 @@
  request
  (create-teamorganisership request))
 (POST "/json/auto/create-visit" request (create-visit request))
- (POST "/json/auto/delete-addresse" request (delete-addresse request))
+ (POST "/json/auto/delete-addresse" request (delete-address request))
 (POST
  "/json/auto/delete-authority"
  request
@ -382,10 +382,10 @@
 (defn
- create-addresse
+ create-address
 "Auto-generated method to insert one record to the addresses table. Expects the following key(s) to be present in `params`: (:id :address :postcode :phone :district_id :latitude :longitude). Returns a map containing the keys (:id) identifying the record created."
 [{:keys [params]}]
- (do (db/create-addresse! params)))
+ (do (db/create-address! params)))
 (defn
@ -515,10 +515,10 @@
 (defn
- delete-addresse
+ 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-addresse! params))
+ (do (db/delete-address! params))
 (response/found "/"))
@ -970,10 +970,10 @@
 (defn
- update-addresse
+ 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 :longitude :phone :postcode)."
 [{:keys [params]}]
- (do (db/update-addresse! params))
+ (do (db/update-address! params))
 (response/found "/"))
--- a/youyesyet.adl.xml
+++ b/youyesyet.adl.xml
@ -0,0 +1,392 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- DOCTYPE application PUBLIC "-//JOURNEYMAN//DTD ADL 1.4//EN"
 "http://www.journeyman.cc/adl/stable/adl/schemas/adl-1.4.dtd" -->
 <application name="youyesyet" version="0.1.1"
             xmlns="http://bowyer.journeyman.cc/adl/1.4/"
             xmlns:adl="http://bowyer.journeyman.cc/adl/1.4/">
  <documentation>
    A web-app intended to be used by canvassers campaigning for a 'Yes' vote in the second independence referendum.
    The web-app will be delivered to canvassers out knocking doors primarily through an HTML5/React single-page app designed to work on a mobile phone; it's possible that someone else may do an Android of iPhone native app to address the same back end but at present I have no plans for this.
    There must also be an administrative interface through which privileged users can set the system up and authorise canvassers, and a 'followup' interface through which issue-expert specialist canvassers can address particular electors' queries.
  </documentation>
  <content>
    <head> </head>
    <top> </top>
    <foot> </foot>
  </content>
  <typedef name="postcode" type="string"
    pattern="^([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([AZa-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9]?[A-Za-z]))))[0-9][A-Za-z]{2})$" size="16">
    <documentation>See
      https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/488478/Bulk_Data_Transfer_-_additional_validation_valid_from_12_November_2015.pdf,
      section 3</documentation>
    <help locale="en-GB">A valid postcode.</help>
  </typedef>
  <group name="public">
    <documentation>All users</documentation>
  </group>
  <group name="canvassers" parent="public">
    <documentation>All users of the canvasser app Able to read and add canvassing data in a limited
      radius around their current position. </documentation>
  </group>
  <group name="teamorganiser" parent="canvassers">
    <documentation>Organisers of canvassing teams Able to see and modify data on the canvassers in
      the team(s) they organise; able to add canvassers to their team; able to update canvassers in
      their team, including resetting passwords and locking accounts; able to see canvass data over
      the whole area in which their team operates. </documentation>
  </group>
  <group name="issueexperts" parent="public">
    <documentation>People expert on particular issues. Able to read followup requests, and the electors to which they
      relate; able to access (read/write) the issues wiki; able to write followuop action records.
    </documentation>
  </group>
  <group name="analysts" parent="public">
    <documentation>Users entitled to see an overview of the canvassing data collected. Able to read canvassing data over the whole map, including historical
      data.</documentation>
  </group>
  <group name="issueeditors" parent="analysts">
    <documentation>Users responsible for determining what issues should be current at any time.
      Able to set current issues; able to add issues.</documentation>
  </group>
  <group name="admin" parent="public">
    <documentation>Able to read and update canvasser records, team membership records, team
      organisership records, issue expertise records; able to add and update reference data
      generally.</documentation>
  </group>
  <entity name="electors">
    <key>
      <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property size="64" required="true" type="string" name="name" column="name" distinct="user">
      <prompt prompt="name" locale="en-GB"/>
    </property>
    <property required="true" type="entity" name="address_id" column="address_id" entity="addresses"
      farkey="id">
      <prompt prompt="address_id" locale="en-GB"/>
    </property>
    <property size="16" type="string" name="phone" column="phone" distinct="user">
      <prompt prompt="phone" locale="en-GB"/>
    </property>
    <property size="128" type="string" name="email" column="email" distinct="user">
      <prompt prompt="email" locale="en-GB"/>
    </property>
    <property name="gender" type="entity" column="gender" entity="genders" farkey="id"
      default="Unknown">
      <prompt prompt="gender" locale="en-GB"/>
    </property>
    <list name="Electors" properties="all"/>
    <form name="Elector" properties="all"/>
  </entity>
  <entity name="genders" natural-key="id">
    <key>
      <property name="id" type="string" size="32" distinct="all">
        <prompt prompt="gender" locale="en-GB"/>
      </property>
    </key>
    <list name="Genders" properties="all"/>
    <form name="Gender" properties="all"/>
  </entity>
  <entity name="addresses">
    <key>
      <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" type="string" name="address" column="address" size="256" distinct="user">
      <prompt prompt="address" locale="en-GB"/>
    </property>
    <property type="defined" typedef="postcode" name="postcode" column="postcode" size="16" distinct="user">
      <prompt prompt="postcode" locale="en-GB"/>
    </property>
    <property type="string" name="phone" column="phone" size="16">
      <prompt prompt="phone" locale="en-GB"/>
    </property>
    <property type="entity" name="district_id" column="district_id" entity="districts" farkey="id">
      <prompt prompt="district_id" locale="en-GB"/>
    </property>
    <property type="real" name="latitude" column="latitude">
      <prompt prompt="latitude" locale="en-GB"/>
    </property>
    <property type="real" name="longitude" column="longitude">
      <prompt prompt="longitude" locale="en-GB"/>
    </property>
    <permission group="admin" permission="all"/>
    <permission group="canvassers" permission="read"/>
    <permission group="analysts" permission="read"/>
    <list name="Addresses" properties="all"/>
    <form name="Address" properties="all"/>
  </entity>
  <entity name="visits">
    <key>
      <property required="true" type="integer" name="id" column="id" distinct="system">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" type="integer" name="address_id" column="address_id"
      entity="addresses" farkey="id">
      <prompt prompt="address_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" name="canvasser_id" column="canvasser_id"
      entity="canvassers" farkey="id">
      <prompt prompt="canvasser_id" locale="en-GB"/>
    </property>
    <property required="true" default="" type="timestamp" name="date" column="date">
      <prompt prompt="date" locale="en-GB"/>
    </property>
    <permission group="public" permission="read"/>
    <permission group="canvassers" permission="insert"/>
  </entity>
  <entity name="authorities">
    <key>
      <property required="true" type="string" name="id" column="id" size="32" distinct="all">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
  </entity>
  <entity name="issues">
    <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">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property type="string" name="url" column="url" size="256">
      <prompt prompt="url" locale="en-GB"/>
    </property>
    <property name="current" type="boolean" default="true">
      <prompt prompt="Is current?" locale="en-GB"/>
    </property>
    <list name="Issues" properties="all"/>
    <form name="Issue" properties="all"/>
  </entity>
  <entity name="intentions">
    <documentation>Link table.</documentation>
    <property required="true" type="entity" entity="visits" farkey="id" name="visit_id"
      column="visit_id">
      <prompt prompt="visit_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" entity="electors" farkey="id" name="elector_id"
      column="elector_id">
      <prompt prompt="elector_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" entity="options" farkey="id" name="option_id"
      column="option_id">
      <prompt prompt="option_id" locale="en-GB"/>
    </property>
  </entity>
  <entity name="canvassers">
    <documentation>Primary users of the system: those actually interviewing electors.</documentation>
    <key>
      <property type="integer" name="id" column="id" distinct="system" immutable="true">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" type="string" name="username" column="username" size="32" distinct="all">
      <prompt prompt="username" locale="en-GB"/>
    </property>
    <property required="true" type="string" name="fullname" column="fullname" size="64" distinct="user">
      <prompt prompt="fullname" locale="en-GB"/>
    </property>
    <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="integer" name="address_id" column="address_id"
      entity="addresses" farkey="id">
      <prompt prompt="address_id" locale="en-GB"/>
    </property>
    <property type="string" name="phone" column="phone" size="16">
      <prompt prompt="phone" locale="en-GB"/>
    </property>
    <property type="string" name="email" column="email" size="128" distinct="user">
      <prompt prompt="email" locale="en-GB"/>
    </property>
    <property required="true" type="entity" name="authority_id"
      entity="authorities" farkey="id">
      <prompt prompt="authority_id" locale="en-GB"/>
    </property>
    <property type="boolean" name="authorised" column="authorised">
      <prompt prompt="authorised" locale="en-GB"/>
    </property>
    <permission group="canvassers" permission="edit">
      <documentation>But only their own record</documentation>
    </permission>
    <permission group="teamleaders" permission="edit">
      <documentation>But only canvassers in their own team.</documentation>
    </permission>
    <permission group="admin" permission="all">
      <documentation>All canvassers</documentation>
    </permission>
  </entity>
  <entity name="followuprequests">
    <documentation>Requests for a followup with an issue expert</documentation>
    <key>
      <property required="true" type="integer" name="id" column="id" distinct="system">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" 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="visit_id" column="visit_id" entity="visits"
      farkey="id">
      <prompt prompt="visit_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" name="issue_id" column="issue_id" entity="issues"
      farkey="id">
      <prompt prompt="issue_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" name="method_id" column="method_id"
      entity="followupmethods" farkey="id">
      <prompt prompt="method_id" locale="en-GB"/>
    </property>
  </entity>
  <entity name="rolememberships">
    <documentation>Link table</documentation>
    <property required="true" type="entity" entity="roles" farkey="id" name="role_id"
      column="role_id">
      <prompt prompt="role_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" entity="canvassers" farkey="id" name="canvasser_id"
      column="canvasser_id">
      <prompt prompt="canvasser_id" locale="en-GB"/>
    </property>
  </entity>
  <entity name="roles">
    <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">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" type="string" name="name" column="name" size="64" distinct="user" immutable="true">
      <prompt prompt="name" locale="en-GB"/>
    </property>
  </entity>
  <entity name="teams">
    <key>
      <property type="integer" name="id" column="id" distinct="system" immutable="true">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" type="string" name="name" column="name" size="64" distinct="user">
      <prompt prompt="name" locale="en-GB"/>
    </property>
    <property required="true" type="entity" entity="districts" farkey="id" name="district_id"
      column="district_id">
      <prompt prompt="district_id" locale="en-GB"/>
    </property>
    <property type="real" name="latitude" column="latitude">
      <prompt prompt="latitude" locale="en-GB"/>
    </property>
    <property type="real" name="longitude" column="longitude">
      <prompt prompt="longitude" locale="en-GB"/>
    </property>
    <permission group="canvassers" permission="read"/>
    <permission group="groupleaders" permission="edit">
      <documentation>But only their own group(s)</documentation>
    </permission>
    <permission group="admin" permission="all">
      <documentation>All groups</documentation>
    </permission>
  </entity>
  <entity name="districts">
    <documentation>Electoral districts</documentation>
    <key>
      <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" type="string" name="name" column="name" size="64" distinct="user">
      <prompt prompt="name" locale="en-GB"/>
    </property>
    <permission group="public" permission="read"></permission>
    <permission group="admin" permission="all"></permission>
  </entity>
  <entity name="teamorganiserships">
    <documentation>Link table</documentation>
    <property required="true" type="entity" entity="teams" farkey="id" name="team_id"
      column="team_id">
      <prompt prompt="team_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" entity="canvassers" farkey="id" name="canvasser_id"
      column="canvasser_id">
      <prompt prompt="canvasser_id" locale="en-GB"/>
    </property>
  </entity>
  <entity name="followupactions">
    <documentation>Actions taken on followup requests.</documentation>
    <key>
      <property required="true" type="integer" name="id" column="id" distinct="system">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" type="entity" name="request_id" column="request_id"
      entity="followuprequests" farkey="id">
      <prompt prompt="request_id" locale="en-GB"/>
    </property>
    <property required="true" type="integer" name="actor" column="actor" entity="canvassers"
      farkey="id">
      <prompt prompt="actor" locale="en-GB"/>
    </property>
    <property required="true" default="" type="timestamp" name="date" column="date">
      <prompt prompt="date" locale="en-GB"/>
    </property>
    <property type="text" name="notes" column="notes">
      <prompt prompt="notes" locale="en-GB"/>
    </property>
    <property type="boolean" name="closed" column="closed" default="false">
      <prompt prompt="closed" locale="en-GB"/>
    </property>
    <permission group="issueexperts" permission="insert"/>
    <permission group="canvassers" permission="read">
      <documentation>But only for electors in their immediate vicinity</documentation>
    </permission>
    <permission group="analysts" permission="read"/>
  </entity>
  <entity name="issueexpertise">
    <documentation>Link table</documentation>
      <property required="true" type="integer" name="canvasser_id" column="canvasser_id"
        entity="canvassers" farkey="id">
        <prompt prompt="canvasser_id" locale="en-GB"/>
      </property>
    <property required="true" type="entity" name="issue_id" column="issue_id" entity="issues"
      farkey="id">
      <prompt prompt="issue_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" name="method_id" column="method_id"
      entity="followupmethods" farkey="id">
      <prompt prompt="method_id" locale="en-GB"/>
    </property>
  </entity>
  <entity name="options">
    <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">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
  </entity>
  <entity name="teammemberships">
    <documentation>Link table</documentation>
    <property required="true" type="entity" entity="teams" farkey="id" name="team_id"
      column="team_id">
      <prompt prompt="team_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" entity="canvassers" farkey="id" name="canvasser_id"
      column="canvasser_id">
      <prompt prompt="canvasser_id" locale="en-GB"/>
    </property>
  </entity>
  <entity name="followupmethods">
    <key>
      <property required="true" type="string" size="32" name="id" column="id" immutable="true" distinct="all">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
  </entity>
 </application>
--- a/youyesyet.canonical.adl.xml
+++ b/youyesyet.canonical.adl.xml
@ -0,0 +1,528 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- DOCTYPE application PUBLIC "-//JOURNEYMAN//DTD ADL 1.4//EN"
 "http://www.journeyman.cc/adl/stable/adl/schemas/adl-1.4.dtd" -->
 <application xmlns="http://bowyer.journeyman.cc/adl/1.4/" xmlns:adl="http://bowyer.journeyman.cc/adl/1.4/" name="youyesyet" version="0.1.1">
  <!--
    ***************************************************************************
    *
    *   Application Description Language Framework
    *	©2007 Cygnet Solutions Ltd
    *
    *	THIS FILE IS AUTOMATICALLY GENERATED AND SHOULD NOT
    *	BE MANUALLY EDITED.
    *
    *   Generated using adl2canonical.xslt 1.10 $
 	  *
 	  ***************************************************************************
 			-->
  <documentation>
    A web-app intended to be used by canvassers campaigning for a 'Yes' vote in the second independence referendum.
    The web-app will be delivered to canvassers out knocking doors primarily through an HTML5/React single-page app designed to work on a mobile phone; it's possible that someone else may do an Android of iPhone native app to address the same back end but at present I have no plans for this.
    There must also be an administrative interface through which privileged users can set the system up and authorise canvassers, and a 'followup' interface through which issue-expert specialist canvassers can address particular electors' queries.
  </documentation>
  <content>
    <head> </head>
    <top> </top>
    <foot> </foot>
  </content>
  <typedef name="postcode" type="string" pattern="^([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([AZa-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9]?[A-Za-z]))))[0-9][A-Za-z]{2})$" size="16">
    <documentation>See
      https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/488478/Bulk_Data_Transfer_-_additional_validation_valid_from_12_November_2015.pdf,
      section 3</documentation>
    <help locale="en-GB">A valid postcode.</help>
  </typedef>
  <group name="public">
    <documentation>All users</documentation>
  </group>
  <group name="canvassers" parent="public">
    <documentation>All users of the canvasser app Able to read and add canvassing data in a limited
      radius around their current position. </documentation>
  </group>
  <group name="teamorganiser" parent="canvassers">
    <documentation>Organisers of canvassing teams Able to see and modify data on the canvassers in
      the team(s) they organise; able to add canvassers to their team; able to update canvassers in
      their team, including resetting passwords and locking accounts; able to see canvass data over
      the whole area in which their team operates. </documentation>
  </group>
  <group name="issueexperts" parent="public">
    <documentation>People expert on particular issues. Able to read followup requests, and the electors to which they
      relate; able to access (read/write) the issues wiki; able to write followuop action records.
    </documentation>
  </group>
  <group name="analysts" parent="public">
    <documentation>Users entitled to see an overview of the canvassing data collected. Able to read canvassing data over the whole map, including historical
      data.</documentation>
  </group>
  <group name="issueeditors" parent="analysts">
    <documentation>Users responsible for determining what issues should be current at any time.
      Able to set current issues; able to add issues.</documentation>
  </group>
  <group name="admin" parent="public">
    <documentation>Able to read and update canvasser records, team membership records, team
      organisership records, issue expertise records; able to add and update reference data
      generally.</documentation>
  </group>
  <!--
 			entity electors already has a key - not generating one
 		-->
  <entity name="electors">
    <key>
      <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property size="64" required="true" type="string" name="name" column="name" distinct="user">
      <prompt prompt="name" locale="en-GB"/>
    </property>
    <property required="true" type="entity" name="dwelling_id" column="dwelling_id" entity="dwelling" farkey="id">
      <prompt prompt="Flat" locale="en-GB"/>
    </property>
    <property size="16" type="string" name="phone" column="phone" distinct="user">
      <prompt prompt="phone" locale="en-GB"/>
    </property>
    <property size="128" type="string" name="email" column="email" distinct="user">
      <prompt prompt="email" locale="en-GB"/>
    </property>
    <property name="gender" type="entity" column="gender" entity="genders" farkey="id" default="Unknown">
      <prompt prompt="gender" locale="en-GB"/>
    </property>
    <list properties="listed" name="Electors"><field property="id"/><field property="name"/><field property="address_id"/><field property="phone"/><field property="email"/><field property="gender"/></list>
    <form properties="listed" name="Elector"><field property="id"/><field property="name"/><field property="address_id"/><field property="phone"/><field property="email"/><field property="gender"/></form>
  </entity>
  <entity name="genders" natural-key="id">
    <key>
      <property name="id" type="string" size="32" distinct="all">
        <prompt prompt="gender" locale="en-GB"/>
      </property>
    </key>
    <permission permission="none" group="public"/>
    <permission permission="none" group="canvassers"/>
    <permission permission="none" group="teamorganiser"/>
    <permission permission="none" group="issueexperts"/>
    <permission permission="none" group="analysts"/>
    <permission permission="none" group="issueeditors"/>
    <permission permission="none" group="admin"/>
    <list properties="listed" name="Genders">
      <field property="id"/>
    </list>
    <form properties="listed" name="Gender">
      <field property="id"/>
    </form>
  </entity>
  <entity name="dwellings">
    <key>
      <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" type="entity" name="address_id" column="address_id" entity="address" farkey="id">
      <prompt prompt="Building Address" locale="en-GB"/>
    </property>
    <property required="false" type="string" size="32" name="sub-address"/>
  </entity>
  <!--
 			entity addresses already has a key - not generating one
 		-->
  <entity name="addresses">
    <key>
      <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" type="string" name="address" column="address" size="256" distinct="user">
      <prompt prompt="address" locale="en-GB"/>
    </property>
    <property type="defined" typedef="postcode" name="postcode" column="postcode" size="16" distinct="user">
      <prompt prompt="postcode" locale="en-GB"/>
    </property>
    <property type="string" name="phone" column="phone" size="16">
      <prompt prompt="phone" locale="en-GB"/>
    </property>
    <property type="entity" name="district_id" column="district_id" entity="districts" farkey="id">
      <prompt prompt="district_id" locale="en-GB"/>
    </property>
    <property type="real" name="latitude" column="latitude">
      <prompt prompt="latitude" locale="en-GB"/>
    </property>dwe
    <property type="real" name="longitude" column="longitude">
      <prompt prompt="longitude" locale="en-GB"/>
    </property>
    <permission group="admin" permission="all"/>
    <permission group="canvassers" permission="read"/>
    <permission group="analysts" permission="read"/>
    <list properties="listed" name="Addresses"><field property="id"/><field property="address"/><field property="postcode"/><field property="phone"/><field property="district_id"/><field property="latitude"/><field property="longitude"/></list>
    <form properties="listed" name="Address"><field property="id"/><field property="address"/><field property="postcode"/><field property="phone"/><field property="district_id"/><field property="latitude"/><field property="longitude"/></form>
  </entity>
  <!--
 			entity visits already has a key - not generating one
 		-->
  <entity name="visits">
    <key>
      <property required="true" type="integer" name="id" column="id" distinct="system">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" type="integer" name="address_id" column="address_id" entity="addresses" farkey="id">
      <prompt prompt="address_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" name="canvasser_id" column="canvasser_id" entity="canvassers" farkey="id">
      <prompt prompt="canvasser_id" locale="en-GB"/>
    </property>
    <property required="true" default="" type="timestamp" name="date" column="date">
      <prompt prompt="date" locale="en-GB"/>
    </property>
    <permission group="public" permission="read"/>
    <permission group="canvassers" permission="insert"/>
  </entity>
  <!--
 			entity authorities already has a key - not generating one
 		-->
  <entity name="authorities">
    <key>
      <property required="true" type="string" name="id" column="id" size="32" distinct="all">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
  </entity>
  <!--
 			entity issues already has a key - not generating one
 		-->
  <entity name="issues">
    <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">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property type="string" name="url" column="url" size="256">
      <prompt prompt="url" locale="en-GB"/>
    </property>
    <property name="current" type="boolean" default="true">
      <prompt prompt="Is current?" locale="en-GB"/>
    </property>
    <list properties="listed" name="Issues"><field property="id"/><field property="url"/><field property="current"/></list>
    <form properties="listed" name="Issue"><field property="id"/><field property="url"/><field property="current"/></form>
  </entity>
  <!--
 			entity intentions has no key - generating one
 		-->
  <entity name="intentions" table="intentions">
    <documentation>Link table.</documentation>
    <key>
      <property type="integer" distinct="system" required="true" name="Id">
        <generator action="native"/>
        <documentation>
 						Auto-generated abstract primary key
 					</documentation>
      </property>
    </key>
    <property required="true" type="entity" entity="visits" farkey="id" name="visit_id" column="visit_id">
      <prompt prompt="visit_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" entity="electors" farkey="id" name="elector_id" column="elector_id">
      <prompt prompt="elector_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" entity="options" farkey="id" name="option_id" column="option_id">
      <prompt prompt="option_id" locale="en-GB"/>
    </property>
    <permission permission="none" group="public"/>
    <permission permission="none" group="canvassers"/>
    <permission permission="none" group="teamorganiser"/>
    <permission permission="none" group="issueexperts"/>
    <permission permission="none" group="analysts"/>
    <permission permission="none" group="issueeditors"/>
    <permission permission="none" group="admin"/>
  </entity>
  <!--
 			entity canvassers already has a key - not generating one
 		-->
  <entity name="canvassers">
    <documentation>Primary users of the system: those actually interviewing electors.</documentation>
    <key>
      <property type="integer" name="id" column="id" distinct="system" immutable="true">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" type="string" name="username" column="username" size="32" distinct="all">
      <prompt prompt="username" locale="en-GB"/>
    </property>
    <property required="true" type="string" name="fullname" column="fullname" size="64" distinct="user">
      <prompt prompt="fullname" locale="en-GB"/>
    </property>
    <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="integer" name="address_id" column="address_id" entity="addresses" farkey="id">
      <prompt prompt="address_id" locale="en-GB"/>
    </property>
    <property type="string" name="phone" column="phone" size="16">
      <prompt prompt="phone" locale="en-GB"/>
    </property>
    <property type="string" name="email" column="email" size="128" distinct="user">
      <prompt prompt="email" locale="en-GB"/>
    </property>
    <property required="true" type="entity" name="authority_id" entity="authorities" farkey="id">
      <prompt prompt="authority_id" locale="en-GB"/>
    </property>
    <property type="boolean" name="authorised" column="authorised">
      <prompt prompt="authorised" locale="en-GB"/>
    </property>
    <permission group="canvassers" permission="edit">
      <documentation>But only their own record</documentation>
    </permission>
    <permission group="teamleaders" permission="edit">
      <documentation>But only canvassers in their own team.</documentation>
    </permission>
    <permission group="admin" permission="all">
      <documentation>All canvassers</documentation>
    </permission>
  </entity>
  <!--
 			entity followuprequests already has a key - not generating one
 		-->
  <entity name="followuprequests">
    <documentation>Requests for a followup with an issue expert</documentation>
    <key>
      <property required="true" type="integer" name="id" column="id" distinct="system">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" 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="visit_id" column="visit_id" entity="visits" farkey="id">
      <prompt prompt="visit_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" name="issue_id" column="issue_id" entity="issues" farkey="id">
      <prompt prompt="issue_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" name="method_id" column="method_id" entity="followupmethods" farkey="id">
      <prompt prompt="method_id" locale="en-GB"/>
    </property>
  </entity>
  <!--
 			entity rolememberships has no key - generating one
 		-->
  <entity name="rolememberships" table="rolememberships">
    <documentation>Link table</documentation>
    <key>
      <property type="integer" distinct="system" required="true" name="Id">
        <generator action="native"/>
        <documentation>
 						Auto-generated abstract primary key
 					</documentation>
      </property>
    </key>
    <property required="true" type="entity" entity="roles" farkey="id" name="role_id" column="role_id">
      <prompt prompt="role_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" entity="canvassers" farkey="id" name="canvasser_id" column="canvasser_id">
      <prompt prompt="canvasser_id" locale="en-GB"/>
    </property>
    <permission permission="none" group="public"/>
    <permission permission="none" group="canvassers"/>
    <permission permission="none" group="teamorganiser"/>
    <permission permission="none" group="issueexperts"/>
    <permission permission="none" group="analysts"/>
    <permission permission="none" group="issueeditors"/>
    <permission permission="none" group="admin"/>
  </entity>
  <!--
 			entity roles already has a key - not generating one
 		-->
  <entity name="roles">
    <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">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" type="string" name="name" column="name" size="64" distinct="user" immutable="true">
      <prompt prompt="name" locale="en-GB"/>
    </property>
  </entity>
  <!--
 			entity teams already has a key - not generating one
 		-->
  <entity name="teams">
    <key>
      <property type="integer" name="id" column="id" distinct="system" immutable="true">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" type="string" name="name" column="name" size="64" distinct="user">
      <prompt prompt="name" locale="en-GB"/>
    </property>
    <property required="true" type="entity" entity="districts" farkey="id" name="district_id" column="district_id">
      <prompt prompt="district_id" locale="en-GB"/>
    </property>
    <property type="real" name="latitude" column="latitude">
      <prompt prompt="latitude" locale="en-GB"/>
    </property>
    <property type="real" name="longitude" column="longitude">
      <prompt prompt="longitude" locale="en-GB"/>
    </property>
    <permission group="canvassers" permission="read"/>
    <permission group="groupleaders" permission="edit">
      <documentation>But only their own group(s)</documentation>
    </permission>
    <permission group="admin" permission="all">
      <documentation>All groups</documentation>
    </permission>
  </entity>
  <!--
 			entity districts already has a key - not generating one
 		-->
  <entity name="districts">
    <documentation>Electoral districts</documentation>
    <key>
      <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" type="string" name="name" column="name" size="64" distinct="user">
      <prompt prompt="name" locale="en-GB"/>
    </property>
    <permission group="public" permission="read"/>
    <permission group="admin" permission="all"/>
  </entity>
  <!--
 			entity teamorganiserships has no key - generating one
 		-->
  <entity name="teamorganiserships" table="teamorganiserships">
    <documentation>Link table</documentation>
    <key>
      <property type="integer" distinct="system" required="true" name="Id">
        <generator action="native"/>
        <documentation>
 						Auto-generated abstract primary key
 					</documentation>
      </property>
    </key>
    <property required="true" type="entity" entity="teams" farkey="id" name="team_id" column="team_id">
      <prompt prompt="team_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" entity="canvassers" farkey="id" name="canvasser_id" column="canvasser_id">
      <prompt prompt="canvasser_id" locale="en-GB"/>
    </property>
    <permission permission="none" group="public"/>
    <permission permission="none" group="canvassers"/>
    <permission permission="none" group="teamorganiser"/>
    <permission permission="none" group="issueexperts"/>
    <permission permission="none" group="analysts"/>
    <permission permission="none" group="issueeditors"/>
    <permission permission="none" group="admin"/>
  </entity>
  <!--
 			entity followupactions already has a key - not generating one
 		-->
  <entity name="followupactions">
    <documentation>Actions taken on followup requests.</documentation>
    <key>
      <property required="true" type="integer" name="id" column="id" distinct="system">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
    <property required="true" type="entity" name="request_id" column="request_id" entity="followuprequests" farkey="id">
      <prompt prompt="request_id" locale="en-GB"/>
    </property>
    <property required="true" type="integer" name="actor" column="actor" entity="canvassers" farkey="id">
      <prompt prompt="actor" locale="en-GB"/>
    </property>
    <property required="true" default="" type="timestamp" name="date" column="date">
      <prompt prompt="date" locale="en-GB"/>
    </property>
    <property type="text" name="notes" column="notes">
      <prompt prompt="notes" locale="en-GB"/>
    </property>
    <property type="boolean" name="closed" column="closed" default="false">
      <prompt prompt="closed" locale="en-GB"/>
    </property>
    <permission group="issueexperts" permission="insert"/>
    <permission group="canvassers" permission="read">
      <documentation>But only for electors in their immediate vicinity</documentation>
    </permission>
    <permission group="analysts" permission="read"/>
  </entity>
  <!--
 			entity issueexpertise has no key - generating one
 		-->
  <entity name="issueexpertise" table="issueexpertise">
    <documentation>Link table</documentation>
    <key>
      <property type="integer" distinct="system" required="true" name="Id">
        <generator action="native"/>
        <documentation>
 						Auto-generated abstract primary key
 					</documentation>
      </property>
    </key>
    <property required="true" type="integer" name="canvasser_id" column="canvasser_id" entity="canvassers" farkey="id">
        <prompt prompt="canvasser_id" locale="en-GB"/>
      </property>
    <property required="true" type="entity" name="issue_id" column="issue_id" entity="issues" farkey="id">
      <prompt prompt="issue_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" name="method_id" column="method_id" entity="followupmethods" farkey="id">
      <prompt prompt="method_id" locale="en-GB"/>
    </property>
    <permission permission="none" group="public"/>
    <permission permission="none" group="canvassers"/>
    <permission permission="none" group="teamorganiser"/>
    <permission permission="none" group="issueexperts"/>
    <permission permission="none" group="analysts"/>
    <permission permission="none" group="issueeditors"/>
    <permission permission="none" group="admin"/>
  </entity>
  <!--
 			entity options already has a key - not generating one
 		-->
  <entity name="options">
    <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">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
  </entity>
  <!--
 			entity teammemberships has no key - generating one
 		-->
  <entity name="teammemberships" table="teammemberships">
    <documentation>Link table</documentation>
    <key>
      <property type="integer" distinct="system" required="true" name="Id">
        <generator action="native"/>
        <documentation>
 						Auto-generated abstract primary key
 					</documentation>
      </property>
    </key>
    <property required="true" type="entity" entity="teams" farkey="id" name="team_id" column="team_id">
      <prompt prompt="team_id" locale="en-GB"/>
    </property>
    <property required="true" type="entity" entity="canvassers" farkey="id" name="canvasser_id" column="canvasser_id">
      <prompt prompt="canvasser_id" locale="en-GB"/>
    </property>
    <permission permission="none" group="public"/>
    <permission permission="none" group="canvassers"/>
    <permission permission="none" group="teamorganiser"/>
    <permission permission="none" group="issueexperts"/>
    <permission permission="none" group="analysts"/>
    <permission permission="none" group="issueeditors"/>
    <permission permission="none" group="admin"/>
  </entity>
  <!--
 			entity followupmethods already has a key - not generating one
 		-->
  <entity name="followupmethods">
    <key>
      <property required="true" type="string" size="32" name="id" column="id" immutable="true" distinct="all">
        <prompt prompt="id" locale="en-GB"/>
      </property>
    </key>
  </entity>
 </application>
		`@ -0,0 +1,2 @@`
							`alter table issues add column current boolean default true;`