diff --git a/transforms01/adl2controllerclasses.xslt b/transforms01/adl2controllerclasses.xslt
index 0e47856..e7c8447 100755
--- a/transforms01/adl2controllerclasses.xslt
+++ b/transforms01/adl2controllerclasses.xslt
@@ -9,8 +9,8 @@
     Transform ADL into (partial) controller classes
     
     $Author: sb $
-    $Revision: 1.27 $
-    $Date: 2008-05-16 11:12:48 $
+    $Revision: 1.28 $
+    $Date: 2008-05-16 15:26:20 $
   -->
 
   <!-- WARNING WARNING WARNING: Do NOT reformat this file! 
@@ -71,7 +71,7 @@
 //
 //  Controller for auto-generated forms for editing <xsl:value-of select="@name"/>s
 //  Automatically generated from application description using
-//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.27 $', 10)"/>
+//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.28 $', 10)"/>
 //
 //  This file is automatically generated; DO NOT EDIT IT.
 //
@@ -128,7 +128,7 @@ namespace <xsl:value-of select="$controllerns"/> {
 //
 //  Controller for auto-generated forms for editing <xsl:value-of select="@name"/>s
 //  Automatically generated from application description using
-//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.27 $', 10)"/>
+//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.28 $', 10)"/>
 //
 //  This file is automatically generated; DO NOT EDIT IT.
 //
@@ -703,8 +703,12 @@ namespace <xsl:value-of select="$controllerns"/> {
 		public void <xsl:value-of select="@name"/>( )
 		{
 			AssertUserCanRead();
-        
-			ISession hibernator = 
+			
+			/* we don't actually instantiate this local variable; it exists to that 
+			 * TypedPropertyBag can do introspection to infer property types */
+			<xsl:value-of select="concat($entityns, '.', ancestor::adl:entity/@name)"/> record = null;
+	
+			ISession hibernator =
 				NHibernateHelper.GetCurrentSession( <xsl:if test="$authentication-layer = 'Database'">Session[ NHibernateHelper.USERTOKEN], 
                                               Session[NHibernateHelper.PASSTOKEN]</xsl:if>);
 
@@ -715,7 +719,7 @@ namespace <xsl:value-of select="$controllerns"/> {
 		<xsl:call-template name="formmenus">
 			<xsl:with-param name="form" select="."/>
 		</xsl:call-template>
-				lastentry = "trailing-comma-avoidance" /* yes, it's a hack */
+				instance = record
 			};
 
 			RenderViewWithFailover("<xsl:value-of select="concat( @name, '.vm')"/>", 
@@ -906,8 +910,8 @@ namespace <xsl:value-of select="$controllerns"/> {
 
 	<!-- produce all menus for a given form: harder, but more efficient -->
 	<xsl:template name="formmenus">
+		<!-- an entity assumed to be of type adl:form -->
 		<xsl:param name="form"/>
-			/* set up menus for the form, if required */
 		<xsl:choose>
 			<xsl:when test="$form/@properties = 'all'">
 				<xsl:call-template name="entitymenus">
diff --git a/transforms01/adl2views.xslt b/transforms01/adl2views.xslt
index 71154d4..c1924a8 100755
--- a/transforms01/adl2views.xslt
+++ b/transforms01/adl2views.xslt
@@ -12,62 +12,69 @@
     Transform ADL into velocity view templates
     
     $Author: sb $
-    $Revision: 1.17 $
-    $Date: 2008-05-15 16:30:25 $
-  -->
-	<!-- WARNING WARNING WARNING: Do NOT reformat this file! 
+    $Revision: 1.18 $
+    $Date: 2008-05-16 15:26:20 $
+	-->
+	  <!-- WARNING WARNING WARNING: Do NOT reformat this file! 
 		Whitespace (or lack of it) is significant! -->
 
-	<!--
+	  <!--
 		TODO: this transform BADLY needs to be refactored! It is /crap/!
-	-->
-	<xsl:output method="xml" indent="yes" encoding="UTF-8" omit-xml-declaration="yes"/>
+		-->
 
-	<!-- The locale for which these views are generated 
+	  <xsl:include href="base-type-include.xslt"/>
+
+	  <xsl:output method="xml" indent="yes" encoding="UTF-8" omit-xml-declaration="yes"/>
+
+	  <!-- The locale for which these views are generated 
       TODO: we need to generate views for each available locale, but this is not
       yet implemented. When it is we will almost certainly still need a 'default locale' -->
-	<xsl:param name="locale" select="en-UK"/>
-    
-	<!-- whether or not to auto-generate site navigation - by default, don't -->
-	<xsl:param name="generate-site-navigation" select="'false'"/>
-	  
-	<!-- whether or not to layout errors - they may be in the default layout -->
-	<xsl:param name="show-errors" select="'false'"/>
+	  <xsl:param name="locale" select="en-UK"/>
+
+	  <!-- whether or not to auto-generate site navigation - by default, don't -->
+	  <xsl:param name="generate-site-navigation" select="'false'"/>
+
+	  <!-- whether or not to layout errors - they may be in the default layout -->
+	  <xsl:param name="show-errors" select="'false'"/>
 	  <!-- whether or not to layout messages - they may be in the default layout -->
 	  <xsl:param name="show-messages" select="'false'"/>
 
+	  <!-- the maximum width, in characters, we're prepared to allocate to widgets -->
+	  <xsl:param name="max-widget-width" select="40"/>
 
 	  <!-- the current state of play is that we can only generate views with permissions for one group. 
-      TODO: this isn't how it's supposed to be. It's supposed to be that at service time the system 
-      checks which groups the current user is member of, and renders each widget with the most relaxed 
-      permissions applicable to that user - but we don't yet have the parts in place to do that.
-      This variable selects which group's permissions should be used when generating widgets -->
-  <xsl:param name="permissions-group" select="public"/>
+		TODO: this isn't how it's supposed to be. It's supposed to be that at service time the system 
+		checks which groups the current user is member of, and renders each widget with the most relaxed 
+		permissions applicable to that user - but we don't yet have the parts in place to do that.
+		This variable selects which group's permissions should be used when generating widgets -->
+	  <xsl:param name="permissions-group" select="public"/>
 
-  <!-- bug 1800 : the name of the Velocity layout to use. If you are to 
-  be able to usefully define content in ADL, then the default ADL layout 
-  needs to be empty, but if ADL-generated pages are to 'play nice' in
-  largely non-ADL applications, they must be able to use standard layouts.
-  If you are going to use a non-default layout, however, you're responsible
-  for making sure it loads all the scripts, etc, that an ADL controller 
-  expects. -->
-  <xsl:param name="layout-name" select="adl-default-layout"/>
-	<!-- bug 1800 : the name of the area (i.e. URL path part) to use -->
-	<xsl:param name="area-name" select="auto"/>
+	  <!-- bug 1800 : the name of the Velocity layout to use. If you are to 
+		be able to usefully define content in ADL, then the default ADL layout 
+		needs to be empty, but if ADL-generated pages are to 'play nice' in
+		largely non-ADL applications, they must be able to use standard layouts.
+		If you are going to use a non-default layout, however, you're responsible
+		for making sure it loads all the scripts, etc, that an ADL controller 
+		expects. -->
+	  <xsl:param name="layout-name" select="adl-default-layout"/>
+	  <!-- bug 1800 : the name of the area (i.e. URL path part) to use -->
+	  <xsl:param name="area-name" select="auto"/>
 
-	<xsl:template match="adl:application">
-    <output>
-			<!-- 'output' is a dummy wrapper root tag to make the entire output work as
+	  <xsl:template match="adl:application">
+		  <output>
+			  <!-- 'output' is a dummy wrapper root tag to make the entire output work as
 				an XML document; the actual output later gets cut into chunks and the
 				wrapper tag is discarded. -->
-      <xsl:apply-templates select="adl:entity"/>
-      <!-- make sure extraneous junk doesn't get into the last file generated,
+			  <xsl:apply-templates select="adl:entity"/>
+			  <!-- make sure extraneous junk doesn't get into the last file generated,
       by putting it into a separate file -->
-      <xsl:comment> [ cut here: next file 'tail.txt' ] </xsl:comment>
-    </output>
-  </xsl:template>
+			  <xsl:text>
+			  </xsl:text>
+			  <xsl:comment> [ cut here: next file 'tail.txt' ] </xsl:comment>
+		  </output>
+	  </xsl:template>
 
-  <xsl:template match="adl:entity[@foreign='true']"/>
+	  <xsl:template match="adl:entity[@foreign='true']"/>
   <!-- Don't bother generating anything for foreign entities -->
 
     <xsl:template match="adl:entity">
@@ -104,7 +111,7 @@
         Auto generated Velocity maybe-delete form for <xsl:value-of select="@name"/>,
         generated from ADL.
 
-        Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.17 $', 10)"/>
+        Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.18 $', 10)"/>
       </xsl:comment>
       <xsl:call-template name="maybe-delete">
         <xsl:with-param name="entity" select="."/>
@@ -127,9 +134,7 @@
 			<xsl:apply-templates select="adl:list" mode="empty-layout"/>
 			<xsl:text>
 			</xsl:text>
-			<xsl:comment>
-				[ cut here: next file '<xsl:value-of select="concat( @name, '/maybedelete.auto.vm')"/>' ]
-			</xsl:comment>
+			<xsl:comment>[ cut here: next file '<xsl:value-of select="concat( @name, '/maybedelete.auto.vm')"/>' ]</xsl:comment>
 			<xsl:text>
 			</xsl:text>
 			<html>
@@ -141,7 +146,7 @@
 						Auto generated Velocity maybe-delete form for <xsl:value-of select="@name"/>,
 						generated from ADL.
 
-						Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.17 $', 10)"/>
+						Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.18 $', 10)"/>
 					</xsl:comment>
 					<xsl:call-template name="install-scripts"/>
 				</head>
@@ -227,7 +232,7 @@
         Auto generated Velocity <xsl:value-of select="@name"/> form for <xsl:value-of select="ancestor::adl:entity/@name"/>,
         generated from ADL.
 
-        Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.17 $', 10)"/>
+        Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.18 $', 10)"/>
       </xsl:comment>
       #capturefor( title)
         #if ( $instance)
@@ -351,7 +356,7 @@
             Auto generated Velocity form for <xsl:value-of select="ancestor::adl:entity/@name"/>,
             generated from ADL.
 
-            Generated using adl2views.xsl <xsl:value-of select="substring( '$Revision: 1.17 $', 10)"/>
+            Generated using adl2views.xsl <xsl:value-of select="substring( '$Revision: 1.18 $', 10)"/>
           </xsl:comment>
           <xsl:call-template name="install-scripts"/>
           <script type='text/javascript' language='JavaScript1.2'>
@@ -586,754 +591,510 @@
 	  </xsl:template>
 
 	  <xsl:template match="adl:auxlist">
-    <xsl:variable name="listprop" select="@property"/>
-    <xsl:variable name="farent" select="ancestor::adl:entity//adl:property[@name=$listprop]/@entity"/>
-    <xsl:variable name="nearent" select="ancestor::adl:entity/@name"/>
-    <xsl:variable name="farid">
-      <xsl:value-of select="//adl:entity[@name=$farent]/adl:key//adl:property[position()=1]/@name"/>
-    </xsl:variable>
-    <xsl:variable name="farkey">
-      <xsl:choose>
-        <xsl:when test="//adl:entity[@name=$farent]//adl:property[@entity=$nearent]/@farkey">
-          <xsl:value-of select="//adl:entity[@name=$farent]//adl:property[@entity=$nearent]/@farkey"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="//adl:entity[@name=$farent]//adl:property[@entity=$nearent]/@name"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="nearkey">
-      <xsl:choose>
-        <xsl:when test="ancestor::adl:entity/adl:key/adl:property[position()=1 and @type='entity']">
-          <xsl:value-of select="concat( ancestor::adl:entity/adl:key/adl:property[position()=1]/@name, '_Value')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="ancestor::adl:entity/adl:key/adl:property[position()=1]/@name"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:comment>
-      $listprop = <xsl:value-of select="$listprop"/>;
-      $farent = <xsl:value-of select="$farent"/>;
-      $nearent = <xsl:value-of select="$nearent"/>;
-      $farid = <xsl:value-of select="$farid"/>;
-      $farkey = <xsl:value-of select="$farkey"/>;
-      $nearkey = <xsl:value-of select="$nearkey"/>;
-    </xsl:comment>
-    <xsl:variable name="action" select="concat( '../', $farent, '/', @onselect)"/>
-    <xsl:if test="@canadd='true'">
-      <tr>
-        <td>
-          <xsl:attribute name="colspan">
-            <xsl:value-of select="count( field)"/>
-          </xsl:attribute>
-          <a>
-            <xsl:attribute name="href">
-              <xsl:value-of select="concat( $action, '.rails?', $farkey, '=$instance.', $nearkey)"/>
-            </xsl:attribute>
-            Add a new <xsl:value-of select="$farent"/>
-          </a>
-        </td>
-      </tr>
-    </xsl:if>
-    <xsl:choose>
-      <xsl:when test="@properties='listed'">
-        <tr>
-          <xsl:for-each select="adl:field">
-            <xsl:variable name="fieldprop" select="@property"/>
-            <th>
-              <!-- Getting the prompt for the field from a property of another entity is a bit 
-                complex... -->
-              <xsl:call-template name="showprompt">
-                <xsl:with-param name="node" select="//adl:entity[@name=$farent]//adl:property[@name=$fieldprop]"/>
-                <xsl:with-param name="fallback" select="@property"/>
-              </xsl:call-template>
-            </th>
-          </xsl:for-each>
-          <th>
-            -
-          </th>
-        </tr>
-        #if ( $instance)
-        #foreach( $item in $instance.<xsl:value-of select="@property"/>)
-        #if ( $velocityCount % 2 == 0)
-        #set( $oddity = "even")
-        #else
-        #set( $oddity = "odd")
-        #end
-        <tr class="$oddity">
-          <xsl:for-each select="adl:field">
-            <xsl:variable name="fieldprop" select="@property"/>
-            <td>
-              <xsl:choose>
-                <xsl:when test="//adl:entity[@name=$farent]//adl:property[@name=$fieldprop]/@type='entity'">
-                  #if ( $item.<xsl:value-of select="@property"/>)
-                  $item.<xsl:value-of select="@property"/>.UserIdentifier
-                  #end
-                </xsl:when>
-                <xsl:when test="//adl:entity[@name=$farent]//adl:property[@name=$fieldprop]/adl:option">
-                  <!-- if we can get a prompt value for the option, it would be better to 
-                  show it than the raw value-->
-                  <xsl:for-each select="//adl:entity[@name=$farent]//adl:property[@name=$fieldprop]/adl:option">
-                    #if ( $item.<xsl:value-of select="$fieldprop"/> == '<xsl:value-of select="@value"/>')
-                    <xsl:call-template name="showprompt">
-											<xsl:with-param name="node" select="."/>
-                      <xsl:with-param name="fallback" select="@value"/>
-                    </xsl:call-template>
-                    #end
-                  </xsl:for-each>
-                </xsl:when>
-                <xsl:otherwise>
-                  $!item.<xsl:value-of select="@property"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </td>
-          </xsl:for-each>
-          <td>
-            <a>
-              <xsl:attribute name="href">
-                <xsl:value-of select="concat( $action, '.rails?', $farid, '=$item.', $farid)"/>
-              </xsl:attribute>
-              Edit!
-            </a>
-          </td>
-        </tr>
-        #end <!-- foreach -->
-        #end <!-- if ($instance) -->
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- properties not listed, so therefore presumably all. -->
-        <tr>
-          <xsl:for-each select="//adl:entity[@name=$farent]//adl:property[@distinct='user' or @distinct='all']">
-            <th>
-							<xsl:call-template name="showprompt">
-								<xsl:with-param name="node" select="."/>
-								<xsl:with-param name="fallback" select="@name"/>
-							</xsl:call-template>
-            </th>
-          </xsl:for-each>
-          <th>-</th>
-        </tr>
-        #if ( $instance)
-        #foreach( $item in $instance.<xsl:value-of select="@property"/>)
-        #if ( $velocityCount % 2 == 0)
-        #set( $oddity = "even")
-        #else
-        #set( $oddity = "odd")
-        #end
-        <tr class="$oddity">
-          <xsl:for-each select="//adl:entity[@name=$farent]//adl:property[@distinct='user' or @distinct='all']">
-            <td>
-              <xsl:variable name="fieldprop" select="@name"/>
-              <xsl:choose>
-                <xsl:when test="@type='entity'">
-                  #if ( $item.<xsl:value-of select="@name"/>)
-                  $item.<xsl:value-of select="@name"/>.UserIdentifier
-                  #end
-                </xsl:when>
-                <xsl:when test="adl:option">
-                  <!-- if we can get a prompt value for the option, it would be better to 
-                  show it than the raw value-->
-                  <xsl:for-each select="adl:option">
-                    #if ( $item.<xsl:value-of select="$fieldprop"/> == '<xsl:value-of select="@value"/>')
-                    <xsl:call-template name="showprompt">
-											<xsl:with-param name="node" select="."/>
-                      <xsl:with-param name="fallback" select="@value"/>
-                    </xsl:call-template>
-                    #end
-                  </xsl:for-each>
-                </xsl:when>
-                <xsl:otherwise>
-                  $!item.<xsl:value-of select="@name"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </td>
-          </xsl:for-each>
-          <td>
-            <a>
-              <xsl:attribute name="href">
-                <xsl:value-of select="concat( $action, '.rails?', $farid, '=$item.', $farid)"/>
-              </xsl:attribute>
-              Edit!
-            </a>
-          </td>
-        </tr>
-        #end <!-- foreach -->
-        #end <!-- if ( $instance)-->
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="adl:verb">
-    <xsl:variable name="class">
-      <xsl:choose>
-        <xsl:when test="@dangerous='true'">actionDangerous</xsl:when>
-        <xsl:otherwise>actionSafe</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <tr>
-      <xsl:attribute name="class"><xsl:value-of select="$class"/></xsl:attribute>
-      <td colspan="2">
-        <xsl:attribute name="class">
-          <xsl:value-of select="$class"/>
-        </xsl:attribute>
-        <xsl:apply-templates select="adl:help[@locale = $locale]"/>
-      </td>
-      <td style="text-align:right">
-        <xsl:attribute name="class">
-          <xsl:value-of select="$class"/>
-        </xsl:attribute>
-        <button name="command">
-          <xsl:attribute name="value">
-            <xsl:value-of select="@verb"/>
-          </xsl:attribute>
-          <xsl:call-template name="showprompt">
-						<xsl:with-param name="node" select="."/>
-            <xsl:with-param name="fallback" select="@verb"/>
-          </xsl:call-template>
-        </button>
-      </td>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="adl:field">
-    <xsl:variable name="propname">
-      <xsl:value-of select="@property"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="ancestor::adl:entity//adl:property[@name=$propname]">
-        <!-- there is a real property -->
-        <xsl:apply-templates select="ancestor::adl:entity//adl:property[@name=$propname]">
-          <xsl:with-param name="oddness">
-            <xsl:choose>
-              <xsl:when test="position() mod 2 = 0">even</xsl:when>
-              <xsl:otherwise>odd</xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:apply-templates>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- it's presumably intended to be a computed field -->
-        <xsl:comment>Computed field (<xsl:value-of select="$propname"/>)? TODO: Not yet implememented</xsl:comment>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="adl:property[@type='message']">
-    <!-- HIHGLY experimental - an internationalised message -->
-    <xsl:param name="oddness" select="odd"/>
-    <tr>
-      <xsl:attribute name="class">
-        <xsl:value-of select="$oddness"/>
-      </xsl:attribute>
-      <td class="label">
-        ${FormHelper.LabelFor( "instance.<xsl:value-of select="@name"/>", "<xsl:call-template name="showprompt">
-					<xsl:with-param name="node" select="."/>
-          <xsl:with-param name="fallback" select="@name"/>
-        </xsl:call-template>")}
-      </td>
-      <td class="widget" colspan="2">
-        #if( $instance)
-          #if( <xsl:value-of select="concat( '$instance.', @name)"/>)
-            <xsl:value-of select="concat( '$t.Msg( $instance.', @name, ')')"/>
-            $FormHelper.HiddenField( "instance.<xsl:value-of select="@name"/>")
-          #else
-        <input type="text">
-          <xsl:attribute name="name">
-            <xsl:value-of select="concat('i18n.instance.', @name)"/>
-          </xsl:attribute>
-        </input>
-          #end
-        #else
-        <input type="text">
-          <xsl:attribute name="name">
-            <xsl:value-of select="concat('i18n.instance.', @name)"/>
-          </xsl:attribute>
-        </input>
-        #end
-      </td>
-    </tr>    
-  </xsl:template>
-  
-  <xsl:template match="adl:property[@type='link']">
-    <!-- note! this template is only intended to match properties in the context of a form:
-      it may be we need to add a mode to indicate this! -->
-    <!-- for links we implement a shuffle widget, which extends over both columns -->
-    <!-- TODO: Permissions! -->
-    <xsl:param name="oddness" select="odd"/>
-    <tr>
-      <xsl:attribute name="class">
-        <xsl:value-of select="$oddness"/>
-      </xsl:attribute>
-      <td class="label" rowspan="2">
-        ${FormHelper.LabelFor( "instance.<xsl:value-of select="@name"/>", "<xsl:call-template name="showprompt">
-					<xsl:with-param name="node" select="."/>
-          <xsl:with-param name="fallback" select="@name"/>
-        </xsl:call-template>")}
-      </td>
-      <td class="widget" colspan="2">
-        <table>
-          <tr>
-            <td class="widget" rowspan="2">
-              ${ShuffleWidgetHelper.UnselectedOptions( "<xsl:value-of select="concat( @name, '_unselected')"/>", <xsl:value-of select="concat( '$all_', @name)"/>, $instance.<xsl:value-of select="@name"/>)}
-            </td>            
-            <td class="widget">
-              <input type="button" value="include &gt;&gt;">
-                <xsl:attribute name="onclick">
-                  <xsl:value-of select="concat( 'shuffle(', @name, '_unselected, ', @name, ')')"/>
-                </xsl:attribute>
-              </input>
-            </td>
-            <td class="widget" rowspan="2">
-              ${ShuffleWidgetHelper.SelectedOptions( "<xsl:value-of select="@name"/>", $instance.<xsl:value-of select="@name"/>)}
-            </td>
-          </tr>
-          <tr>
-            <td class="widget">
-              <input type="button" value="&lt;&lt; exclude">
-                <xsl:attribute name="onclick">
-                  <xsl:value-of select="concat( 'shuffle(', @name, ', ', @name, '_unselected)')"/>
-                </xsl:attribute>
-              </input>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr>
-      <xsl:attribute name="class">
-        <xsl:choose>
-          <xsl:when test="position() mod 2 = 0">even</xsl:when>
-          <xsl:otherwise>odd</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-      <td class="help" colspan="2">
-        <xsl:apply-templates select="adl:help[@locale = $locale]"/>
-      </td>
-    </tr>
-  </xsl:template>
-
-
-  <xsl:template match="adl:property[@type='text']">
-    <!-- note! this template is only intended to match properties in the context of a form:
-      it may be we need to add a mode to indicate this! -->
-    <!-- text box widgets, like shuffle widgets, extend over both columns -->
-    <!-- TODO: Permissions! -->
-    <xsl:param name="oddness" select="odd"/>
-    <xsl:variable name="if-missing">
-      <xsl:choose>
-        <xsl:when test="if-missing[@locale = $locale]">
-          <xsl:value-of select="if-missing[@locale = $locale]"/>
-        </xsl:when>
-        <xsl:when test="required='true'">You must provide a value for <xsl:value-of select="@name"/></xsl:when>
-        <xsl:otherwise>Enter a value for <xsl:value-of select="@name"/></xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <tr>
-      <xsl:attribute name="class">
-        <xsl:value-of select="$oddness"/>
-      </xsl:attribute>
-      <td class="label" rowspan="2">
-        ${FormHelper.LabelFor( "instance.<xsl:value-of select="@name"/>", "<xsl:call-template name="showprompt">
-					<xsl:with-param name="node" select="."/>
-					<xsl:with-param name="fallback" select="@name"/>
-				</xsl:call-template>")}
-			</td>
-      <td class="widget" colspan="2">
-        ${FormHelper.TextArea( "instance.<xsl:value-of select="@name"/>", "%{rows='8', cols='60', title='<xsl:value-of select="$if-missing"/>'}")}
-      </td>
-    </tr>
-    <tr>
-      <xsl:attribute name="class">
-        <xsl:choose>
-          <xsl:when test="position() mod 2 = 0">even</xsl:when>
-          <xsl:otherwise>odd</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-      <td class="help" colspan="2">
-        <xsl:apply-templates select="adl:help[@locale = $locale]"/>
-      </td>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="adl:property">
-    <xsl:param name="oddness" select="odd"/>
-    <!-- note! this template is only intended to match properties in the context of a form:
-      it may be we need to add a mode to indicate this! -->
-    <!-- TODO: This really needs to be refactored -->
-    <!-- TODO: we really need to be able to handle different permissions for different 
-    groups. If the current user is not a member of a group which has read access to 
-    this widget, the widget shouldn't even appear (unless they have write but not read?); 
-    if they are not a member of a group which has write access, the widget should be 
-    disabled. I don't have time to implement this now as it is not trivial, but it is 
-    important! -->
-    <!-- TODO: this is a one-database-role permission model, because that's all SRU needs. 
-        Different permissions for different database groups is much more complex! Also, this 
-        handles permissions on only properties and entities, not on forms. Perhaps we need a 
-        Helper class? -->
-    <xsl:variable name="permission">
-      <xsl:call-template name="property-permission">
-        <xsl:with-param name="property" select="."/>
-        <xsl:with-param name="groupname" select ="$permissions-group"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="$permission != 'none'">
-    <tr>
-      <xsl:attribute name="class">
-        <xsl:value-of select="$oddness"/>
-      </xsl:attribute>
-      <td class="label">
-        ${FormHelper.LabelFor( "instance.<xsl:value-of select="@name"/>", "<xsl:call-template name="showprompt">
-          <xsl:with-param name="fallback" select="@name"/>
-        </xsl:call-template>")}
-      </td>
-      <td class="widget">
-        <xsl:choose>
-          <xsl:when test="$permission='none'">
-            [You are not authorised to see this data]
-          </xsl:when>
-          <xsl:when test="$permission='read'">
-            <xsl:choose>
-              <xsl:when test="@type='entity'">
-                <xsl:value-of select="concat('$instance.', @name, '.UserIdentifier')"/>
+		  <xsl:variable name="listprop" select="@property"/>
+		  <xsl:variable name="farent" select="ancestor::adl:entity//adl:property[@name=$listprop]/@entity"/>
+		  <xsl:variable name="nearent" select="ancestor::adl:entity/@name"/>
+		  <xsl:variable name="farid">
+			  <xsl:value-of select="//adl:entity[@name=$farent]/adl:key//adl:property[position()=1]/@name"/>
+		  </xsl:variable>
+		  <xsl:variable name="farkey">
+			  <xsl:choose>
+				  <xsl:when test="//adl:entity[@name=$farent]//adl:property[@entity=$nearent]/@farkey">
+					  <xsl:value-of select="//adl:entity[@name=$farent]//adl:property[@entity=$nearent]/@farkey"/>
+				  </xsl:when>
+				  <xsl:otherwise>
+					  <xsl:value-of select="//adl:entity[@name=$farent]//adl:property[@entity=$nearent]/@name"/>
+				  </xsl:otherwise>
+			  </xsl:choose>
+		  </xsl:variable>
+		  <xsl:variable name="nearkey">
+			  <xsl:choose>
+				  <xsl:when test="ancestor::adl:entity/adl:key/adl:property[position()=1 and @type='entity']">
+					  <xsl:value-of select="concat( ancestor::adl:entity/adl:key/adl:property[position()=1]/@name, '_Value')"/>
+				  </xsl:when>
+				  <xsl:otherwise>
+					  <xsl:value-of select="ancestor::adl:entity/adl:key/adl:property[position()=1]/@name"/>
+				  </xsl:otherwise>
+			  </xsl:choose>
+		  </xsl:variable>
+		  <xsl:comment>
+			  $listprop = <xsl:value-of select="$listprop"/>;
+			  $farent = <xsl:value-of select="$farent"/>;
+			  $nearent = <xsl:value-of select="$nearent"/>;
+			  $farid = <xsl:value-of select="$farid"/>;
+			  $farkey = <xsl:value-of select="$farkey"/>;
+			  $nearkey = <xsl:value-of select="$nearkey"/>;
+		  </xsl:comment>
+		  <xsl:variable name="action" select="concat( '../', $farent, '/', @onselect)"/>
+		  <xsl:if test="@canadd='true'">
+			  <tr>
+				  <td>
+					  <xsl:attribute name="colspan">
+						  <xsl:value-of select="count( field)"/>
+					  </xsl:attribute>
+					  <a>
+						  <xsl:attribute name="href">
+							  <xsl:value-of select="concat( $action, '.rails?', $farkey, '=$instance.', $nearkey)"/>
+						  </xsl:attribute>
+						  Add a new <xsl:value-of select="$farent"/>
+					  </a>
+				  </td>
+			  </tr>
+		  </xsl:if>
+		  <xsl:choose>
+			  <xsl:when test="@properties='listed'">
+				  <tr>
+					  <xsl:for-each select="adl:field">
+						  <xsl:variable name="fieldprop" select="@property"/>
+						  <th>
+							  <!-- Getting the prompt for the field from a property of another entity is a bit 
+								complex... -->
+							  <xsl:call-template name="showprompt">
+								  <xsl:with-param name="node" select="//adl:entity[@name=$farent]//adl:property[@name=$fieldprop]"/>
+								  <xsl:with-param name="fallback" select="@property"/>
+							  </xsl:call-template>
+						  </th>
+					  </xsl:for-each>
+					  <th>
+						  -
+					  </th>
+				  </tr>
 				  #if ( $instance)
-					${FormHelper.HiddenField( "<xsl:value-of select="concat('instance.', @name, '.KeyString')"/>")}
+				  #foreach( $item in $instance.<xsl:value-of select="@property"/>)
+				  #if ( $velocityCount % 2 == 0)
+				  #set( $oddity = "even")
+				  #else
+				  #set( $oddity = "odd")
 				  #end
-              </xsl:when>
-              <!-- TODO: if @type='list' or 'link', should generate Velocity to generate ul list
-                of UserIdentifiers
-              -->
-              <xsl:otherwise>
-                <xsl:value-of select="concat('$instance.', @name)"/>
+				  <tr class="$oddity">
+					  <xsl:for-each select="adl:field">
+						  <xsl:variable name="fieldprop" select="@property"/>
+						  <td>
+							  <xsl:choose>
+								  <xsl:when test="//adl:entity[@name=$farent]//adl:property[@name=$fieldprop]/@type='entity'">
+									  #if ( $item.<xsl:value-of select="@property"/>)
+									  $item.<xsl:value-of select="@property"/>.UserIdentifier
+									  #end
+								  </xsl:when>
+								  <xsl:when test="//adl:entity[@name=$farent]//adl:property[@name=$fieldprop]/adl:option">
+									  <!-- if we can get a prompt value for the option, it would be better to 
+										show it than the raw value-->
+									  <xsl:for-each select="//adl:entity[@name=$farent]//adl:property[@name=$fieldprop]/adl:option">
+										  #if ( $item.<xsl:value-of select="$fieldprop"/> == '<xsl:value-of select="@value"/>')
+										  <xsl:call-template name="showprompt">
+											  <xsl:with-param name="node" select="."/>
+											  <xsl:with-param name="fallback" select="@value"/>
+										  </xsl:call-template>
+										  #end
+									  </xsl:for-each>
+								  </xsl:when>
+								  <xsl:otherwise>
+									  $!item.<xsl:value-of select="@property"/>
+								  </xsl:otherwise>
+							  </xsl:choose>
+						  </td>
+					  </xsl:for-each>
+					  <td>
+						  <a>
+							  <xsl:attribute name="href">
+								  <xsl:value-of select="concat( $action, '.rails?', $farid, '=$item.', $farid)"/>
+							  </xsl:attribute>
+							  Edit!
+						  </a>
+					  </td>
+				  </tr>
+				  #end <!-- foreach -->
+				  #end <!-- if ($instance) -->
+			  </xsl:when>
+			  <xsl:otherwise>
+				  <!-- properties not listed, so therefore presumably all. -->
+				  <tr>
+					  <xsl:for-each select="//adl:entity[@name=$farent]//adl:property[@distinct='user' or @distinct='all']">
+						  <th>
+							  <xsl:call-template name="showprompt">
+								  <xsl:with-param name="node" select="."/>
+								  <xsl:with-param name="fallback" select="@name"/>
+							  </xsl:call-template>
+						  </th>
+					  </xsl:for-each>
+					  <th>-</th>
+				  </tr>
 				  #if ( $instance)
-					${FormHelper.HiddenField( "<xsl:value-of select="concat('instance.', @name)"/>")}
+				  #foreach( $item in $instance.<xsl:value-of select="@property"/>)
+				  #if ( $velocityCount % 2 == 0)
+				  #set( $oddity = "even")
+				  #else
+				  #set( $oddity = "odd")
 				  #end
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:when test="$permission='insert' or $permission='noedit'">
-			#if ( $instance)
-            #if ($instance.<xsl:value-of select="@name"/>)
-            <xsl:choose>
-              <xsl:when test="@type='entity'">
-                <xsl:value-of select="concat('$instance.', @name, '.UserIdentifier')"/>
-                ${FormHelper.HiddenField( "<xsl:value-of select="concat('instance.', @name, '.KeyString')"/>")}
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="concat('$instance.', @name)"/>
-                ${FormHelper.HiddenField( "<xsl:value-of select="concat('instance.', @name)"/>")}
-              </xsl:otherwise>
-            </xsl:choose>
-            #else
-            <xsl:call-template name="widget">
-              <xsl:with-param name="property" select="."/>
-            </xsl:call-template>
-			#end
-			#else
-			<xsl:call-template name="widget">
-			  <xsl:with-param name="property" select="."/>
-			</xsl:call-template>
-			#end
-		  </xsl:when>
-          <!-- TODO: if $permission='insert', then you should get an editable widget if there 
-          is no current value, else a 'not authorised' message -->
-          <!-- TODO: if $permission='noedit', then you should get an editable widget if there 
-          is no current value, else just the value -->
-          <xsl:otherwise>
-            <xsl:call-template name="widget">
-              <xsl:with-param name="property" select="."/>
-            </xsl:call-template>
-          </xsl:otherwise>
-      </xsl:choose>        
-      </td>
-      <td class="help">
-        <xsl:apply-templates select="adl:help[@locale = $locale]"/>
-      </td>
-    </tr>
-    </xsl:if>
-  </xsl:template>
+				  <tr class="$oddity">
+					  <xsl:for-each select="//adl:entity[@name=$farent]//adl:property[@distinct='user' or @distinct='all']">
+						  <td>
+							  <xsl:variable name="fieldprop" select="@name"/>
+							  <xsl:choose>
+								  <xsl:when test="@type='entity'">
+									  #if ( $item.<xsl:value-of select="@name"/>)
+									  $item.<xsl:value-of select="@name"/>.UserIdentifier
+									  #end
+								  </xsl:when>
+								  <xsl:when test="adl:option">
+									  <!-- if we can get a prompt value for the option, it would be better to 
+										show it than the raw value-->
+									  <xsl:for-each select="adl:option">
+										  #if ( $item.<xsl:value-of select="$fieldprop"/> == '<xsl:value-of select="@value"/>')
+										  <xsl:call-template name="showprompt">
+											  <xsl:with-param name="node" select="."/>
+											  <xsl:with-param name="fallback" select="@value"/>
+										  </xsl:call-template>
+										  #end
+									  </xsl:for-each>
+								  </xsl:when>
+								  <xsl:otherwise>
+									  $!item.<xsl:value-of select="@name"/>
+								  </xsl:otherwise>
+							  </xsl:choose>
+						  </td>
+					  </xsl:for-each>
+					  <td>
+						  <a>
+							  <xsl:attribute name="href">
+								  <xsl:value-of select="concat( $action, '.rails?', $farid, '=$item.', $farid)"/>
+							  </xsl:attribute>
+							  Edit!
+						  </a>
+					  </td>
+				  </tr>
+				  #end <!-- foreach -->
+				  #end <!-- if ( $instance)-->
+			  </xsl:otherwise>
+		  </xsl:choose>
+	  </xsl:template>
 
-    <!-- render an appropriate widget for the indicated property 
-      property: a property element
-    -->
-    <xsl:template name="widget">
-      <xsl:param name="property"/>
-      <xsl:variable name="if-missing">
-        <xsl:choose>
-          <xsl:when test="adl:if-missing[@locale = $locale]">
-            <xsl:value-of select="adl:if-missing[@locale = $locale]"/>
-          </xsl:when>
-          <xsl:when test="$property/@required='true'">
-            You must provide a value for <xsl:value-of select="$property/@name"/>
-          </xsl:when>
-          <xsl:when test="$property/@type='defined'">
-            The value for <xsl:value-of select="$property/@name"/> must be <xsl:value-of select="$property/@definition"/>
-          </xsl:when>
-          <xsl:when test="$property/@type='entity'">
-            The value for <xsl:value-of select="$property/@name"/> must be an instance of <xsl:value-of select="$property/@entity"/>
-          </xsl:when>
-          <xsl:otherwise>
-            The value for <xsl:value-of select="$property/@name"/> must be <xsl:value-of select="$property/@type"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      <xsl:choose>
-      <xsl:when test="$property/@type='entity'">
-        <!-- a menu of the appropriate entity -->
-        <xsl:choose>
-          <xsl:when test="$property/@required='true'">
-            <!-- if required='true', then you should not get the firstoption stuff -->
-            #if ( $instance)
-            ${FormHelper.Select( "instance.<xsl:value-of select="$property/@name"/>", $instance.<xsl:value-of select="$property/@name"/>, <xsl:value-of select="concat( '$all_', @name)"/>, "%{text='UserIdentifier', value='KeyString', title='<xsl:value-of select="normalize-space( $if-missing)"/>'}" )}
-            #else
-            ${FormHelper.Select( "instance.<xsl:value-of select="$property/@name"/>", $<xsl:value-of select="$property/@name"/>, <xsl:value-of select="concat( '$all_', @name)"/>, "%{text='UserIdentifier', value='KeyString', title='<xsl:value-of select="normalize-space( $if-missing)"/>'}" )}
-            #end
-          </xsl:when>
-          <xsl:otherwise>
-            #if ( $instance)
-            ${FormHelper.Select( "instance.<xsl:value-of select="$property/@name"/>", $instance.<xsl:value-of select="$property/@name"/>, <xsl:value-of select="concat( '$all_', @name)"/>, "%{firstoption='[unset]', firstoptionvalue='-1', text='UserIdentifier', value='KeyString', title='<xsl:value-of select="normalize-space( $if-missing)"/>'}" )}
-            #else
-            ${FormHelper.Select( "instance.<xsl:value-of select="$property/@name"/>", $<xsl:value-of select="$property/@name"/>, <xsl:value-of select="concat( '$all_', @name)"/>, "%{firstoption='[unset]', firstoptionvalue='-1', text='UserIdentifier', value='KeyString', title='<xsl:value-of select="normalize-space( $if-missing)"/>'}" )}
-            #end
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:when test="$property/@type='list'">
-        <!-- a multi-select menu of the appropriate entity -->
-        ${FormHelper.Select( "instance.<xsl:value-of select="$property/@name"/>", $instance.<xsl:value-of select="$property/@name"/>, <xsl:value-of select="concat( '$all_', @name)"/>, "%{multiple='multiple', size='8', text='UserIdentifier', value='KeyString', title='<xsl:value-of select="normalize-space( $if-missing)"/>'}" )}
-      </xsl:when>
-      <xsl:when test="$property/@type='defined'">
-        <!-- likely to be hardest of all... -->
-        <xsl:variable name="definition">
-          <xsl:value-of select="$property/@definition"/>
-        </xsl:variable>
-        <xsl:variable name="maximum">
-          <xsl:value-of select="//adl:definition[@name=$definition]/@maximum"/>
-        </xsl:variable>
-        <xsl:variable name="minimum">
-          <xsl:value-of select="//adl:definition[@name=$definition]/@minimum"/>
-        </xsl:variable>
-        <xsl:variable name="validationpattern">
-          <xsl:value-of select="//adl:definition[@name=$definition]/@pattern"/>
-        </xsl:variable>
-        <xsl:variable name="definedtype">
-          <xsl:value-of select="//adl:definition[@name=$definition]/@type"/>
-        </xsl:variable>
-        <xsl:variable name="definedsize">
-          <xsl:value-of select="//adl:definition[@name=$definition]/@size"/>
-        </xsl:variable>
-        <input type="text">
-          <xsl:variable name="cssclass">
-            <xsl:if test="$property/@required='true'">required </xsl:if>
-            <xsl:choose>
-              <xsl:when test="//adl:definition[@name=$definition]/@pattern">
-                <xsl:value-of select="concat( 'validate-custom-', $definition)"/>
-              </xsl:when>
-              <xsl:when test="//adl:definition[@name=$definition]/@minimum">
-                <xsl:value-of select="concat( 'validate-custom-', $definition)"/>
-              </xsl:when>
-              <xsl:when test="$definedtype='integer'">validate-digits</xsl:when>
-              <xsl:when test="$definedtype='real'">validate-number</xsl:when>
-              <xsl:when test="$definedtype='money'">validate-number</xsl:when>
-              <xsl:when test="$definedtype='date'">date-field validate-date</xsl:when>
-            </xsl:choose>
-          </xsl:variable>
-          <xsl:attribute name="class">
-            <xsl:value-of select="normalize-space( cssclass)"/>
-          </xsl:attribute>
-          <xsl:attribute name="id">
-            <xsl:value-of select="concat( 'instance_', @name)"/>
-          </xsl:attribute>
-          <xsl:attribute name="name">
-            <xsl:value-of select="concat( 'instance.', @name)"/>
-          </xsl:attribute>
-          <xsl:choose>
-            <xsl:when test="$definedsize &lt; 60">
-              <xsl:attribute name="size">
-                <xsl:value-of select="$definedsize"/>
-              </xsl:attribute>
-              <xsl:attribute name="maxlength">
-                <xsl:value-of select="$definedsize"/>
-              </xsl:attribute>
-            </xsl:when>
-            <xsl:when test="$definedsize &gt;= 60">
-              <xsl:attribute name="size">
-                <xsl:value-of select="60"/>
-              </xsl:attribute>
-              <xsl:attribute name="maxlength">
-                <xsl:value-of select="$definedsize"/>
-              </xsl:attribute>
-            </xsl:when>
-          </xsl:choose>
-          <xsl:attribute name="value">
-            $!instance.<xsl:value-of select="$property/@name"/>
-          </xsl:attribute>
-          <xsl:attribute name="title">
-            <xsl:value-of select="normalize-space( $if-missing)"/>
-          </xsl:attribute>
-        </input>
-        <xsl:if test="string-length( $minimum) &gt; 0 and string-length( $maximum) &gt; 0">
-          <div style="width:200px; height:20px; background: transparent url(../images/slider-images-track-right.png) no-repeat top right;">
-            <xsl:attribute name="id">
-              <xsl:value-of select="concat( @name, '-track')"/>
-            </xsl:attribute>
-            <div style="position: absolute; width: 5px; height: 20px; background: transparent url(../images/slider-images-track-left.png) no-repeat top left">
-              <xsl:attribute name="id">
-                <xsl:value-of select="concat( @name, '-track-left')"/>
-              </xsl:attribute>
-            </div>
-            <div style="width:19px; height:20px;">
-              <xsl:attribute name="id">
-                <xsl:value-of select="concat( @name, '-slider')"/>
-              </xsl:attribute>
-              <img src="../images/slider-images-handle.png" alt="" style="float: left;" />
-            </div>
-          </div>
-          <script type="text/javascript" language="javascript">
-            // &lt;![CDATA[
-            new Control.Slider('<xsl:value-of select="$property/@name"/>-slider','<xsl:value-of select="$property/@name"/>-track',{
-            onSlide:function(v){$('<xsl:value-of select="concat( 'instance_', @name)"/>').value = <xsl:value-of select="$minimum"/>+ Math.floor(v*(<xsl:value-of select="$maximum - $minimum"/>))}
-            })
-            // ]]&gt;
-          </script>
-        </xsl:if>
-        <!-- TODO: generate javascript to do client-side validation -->
-      </xsl:when>
-      <xsl:when test="adl:option">
-        <!-- if a property has options, we definitely want a select widget-->
-        <select>
-          <xsl:attribute name="id">
-            <xsl:value-of select="concat( 'instance_', @name)"/>
-          </xsl:attribute>
-          <xsl:attribute name="name">
-            <xsl:value-of select="concat( 'instance.', @name)"/>
-          </xsl:attribute>
-          <xsl:attribute name="title">
-            <xsl:value-of select="normalize-space( $if-missing)"/>
-          </xsl:attribute>
-          <xsl:apply-templates select="adl:option"/>
-        </select>
-        <script type="text/javascript" language="javascript">
-          // &lt;![CDATA[
-          #set ( <xsl:value-of select="concat( '$', @name, '_sel_opt')"/>="<xsl:value-of select="concat( @name, '-$instance.', @name)"/>")
-          option = document.getElementById( "<xsl:value-of select="concat( '$', @name, '_sel_opt')"/>");
+	  <xsl:template match="adl:verb">
+		  <xsl:variable name="class">
+			  <xsl:choose>
+				  <xsl:when test="@dangerous='true'">actionDangerous</xsl:when>
+				  <xsl:otherwise>actionSafe</xsl:otherwise>
+			  </xsl:choose>
+		  </xsl:variable>
+		  <tr>
+			  <xsl:attribute name="class">
+				  <xsl:value-of select="$class"/>
+			  </xsl:attribute>
+			  <td colspan="2">
+				  <xsl:attribute name="class">
+					  <xsl:value-of select="$class"/>
+				  </xsl:attribute>
+				  <xsl:apply-templates select="adl:help[@locale = $locale]"/>
+			  </td>
+			  <td style="text-align:right">
+				  <xsl:attribute name="class">
+					  <xsl:value-of select="$class"/>
+				  </xsl:attribute>
+				  <button name="command">
+					  <xsl:attribute name="value">
+						  <xsl:value-of select="@verb"/>
+					  </xsl:attribute>
+					  <xsl:call-template name="showprompt">
+						  <xsl:with-param name="node" select="."/>
+						  <xsl:with-param name="fallback" select="@verb"/>
+					  </xsl:call-template>
+				  </button>
+			  </td>
+		  </tr>
+	  </xsl:template>
 
-          if ( option != null)
-          {
-          option.selected = true;
-          }
-          // ]]&gt;
-        </script>
-      </xsl:when>
-      <xsl:when test="$property/@type='boolean'">
-        ${FormHelper.CheckboxField( "instance.<xsl:value-of select="$property/@name"/>")}
-      </xsl:when>
-      <xsl:when test="$property/@type='date'">
-        <xsl:variable name="class">
-          <xsl:if test="$property/@required='true'">required </xsl:if>date-field validate-date
-        </xsl:variable>
-        ${FormHelper.TextField( "instance.<xsl:value-of select="$property/@name"/>", "%{class='<xsl:value-of select="normalize-space( $class)"/>', textformat='d', size='10', maxlength='10'}")}
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="class">
-          <xsl:if test="$property/@required='true'">required </xsl:if>
-          <xsl:choose>
-            <xsl:when test="$property/@type='integer'">validate-digits</xsl:when>
-            <xsl:when test="$property/@type='real'">validate-number</xsl:when>
-            <xsl:when test="$property/@type='money'">validate-number</xsl:when>
-          </xsl:choose>
-        </xsl:variable>
-        <xsl:variable name="size">
-          <xsl:choose>
-            <xsl:when test="$property/@size &lt; 60">
-              <xsl:value-of select="$property/@size"/>
-            </xsl:when>
-            <xsl:when test="$property/@type='integer'">8</xsl:when>
-            <xsl:when test="$property/@type='real'">8</xsl:when>
-            <xsl:when test="$property/@type='money'">8</xsl:when>
-            <xsl:otherwise>60</xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-        <xsl:variable name="maxlength">
-          <xsl:choose>
-            <xsl:when test="$property/@size &gt;= 60">
-              <xsl:value-of select="$property/@size"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="$size"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-        ${FormHelper.TextField( "instance.<xsl:value-of select="$property/@name"/>", "%{class='<xsl:value-of select="$class"/>', title='<xsl:value-of select="normalize-space( $if-missing)"/>', size='<xsl:value-of select="$size"/>', maxlength='<xsl:value-of select="$maxlength"/>'}")}
-      </xsl:otherwise>
-      </xsl:choose>
-    </xsl:template>
+	  <xsl:template match="adl:field">
+		  <xsl:variable name="propname">
+			  <xsl:value-of select="@property"/>
+		  </xsl:variable>
+		  <xsl:choose>
+			  <xsl:when test="ancestor::adl:entity//adl:property[@name=$propname]">
+				  <!-- there is a real property -->
+				  <xsl:apply-templates select="ancestor::adl:entity//adl:property[@name=$propname]">
+					  <xsl:with-param name="oddness">
+						  <xsl:choose>
+							  <xsl:when test="position() mod 2 = 0">even</xsl:when>
+							  <xsl:otherwise>odd</xsl:otherwise>
+						  </xsl:choose>
+					  </xsl:with-param>
+				  </xsl:apply-templates>
+			  </xsl:when>
+			  <xsl:otherwise>
+				  <!-- it's presumably intended to be a computed field -->
+				  <xsl:comment>
+					  Computed field (<xsl:value-of select="$propname"/>)? TODO: Not yet implememented
+				  </xsl:comment>
+			  </xsl:otherwise>
+		  </xsl:choose>
+	  </xsl:template>
 
-  <xsl:template match="adl:prompt">
-    <xsl:value-of select="@prompt"/>
-  </xsl:template>
-  
-  <xsl:template match="adl:help">
-    <xsl:apply-templates/>
-  </xsl:template>
+	  <xsl:template match="adl:property[@type='message']">
+		  <!-- HIHGLY experimental - an internationalised message -->
+		  <xsl:param name="oddness" select="odd"/>
+		  <tr>
+			  <xsl:attribute name="class">
+				  <xsl:value-of select="$oddness"/>
+			  </xsl:attribute>
+			  <td class="label">
+				  ${FormHelper.LabelFor( "instance.<xsl:value-of select="@name"/>", "<xsl:call-template name="showprompt">
+					  <xsl:with-param name="node" select="."/>
+					  <xsl:with-param name="fallback" select="@name"/>
+				  </xsl:call-template>")}
+			  </td>
+			  <td class="widget" colspan="2">
+				  #if( $instance)
+				  #if( <xsl:value-of select="concat( '$instance.', @name)"/>)
+				  <xsl:value-of select="concat( '$t.Msg( $instance.', @name, ')')"/>
+				  $FormHelper.HiddenField( "instance.<xsl:value-of select="@name"/>")
+				  #else
+				  <input type="text">
+					  <xsl:attribute name="name">
+						  <xsl:value-of select="concat('i18n.instance.', @name)"/>
+					  </xsl:attribute>
+				  </input>
+				  #end
+				  #else
+				  <input type="text">
+					  <xsl:attribute name="name">
+						  <xsl:value-of select="concat('i18n.instance.', @name)"/>
+					  </xsl:attribute>
+				  </input>
+				  #end
+			  </td>
+		  </tr>
+	  </xsl:template>
 
-  <xsl:template match="adl:option">
-    <option>
-      <xsl:attribute name="id"><xsl:value-of select="../@name"/>-<xsl:value-of select="@value"/></xsl:attribute>
-      <xsl:attribute name="value">
-        <xsl:value-of select="@value"/>
-      </xsl:attribute>
-			<xsl:call-template name="showprompt">
-				<xsl:with-param name="node" select="."/>
-				<xsl:with-param name="fallback" select="@value"/>
-			</xsl:call-template>
-		</option>
-  </xsl:template>
-    
-  <!-- layout of lists -->
-  <!-- layout of a list assuming a non-empty layout -->
-    <xsl:template match="adl:list" mode="non-empty-layout">
-      <xsl:text>
-      </xsl:text>
-      <xsl:comment>[ cut here: next file '<xsl:value-of select="concat( ../@name, '/', @name)"/>.auto.vm' ]</xsl:comment>
-      <xsl:text>
-      </xsl:text>
-      <xsl:variable name="withpluralsuffix">
-        <!-- English-laguage syntactic sugar of entity name -->
-        <xsl:choose>
-          <xsl:when test="../@name='Person'">People</xsl:when>
-          <xsl:when test="starts-with( substring(../@name, string-length(../@name) ), 's')">
-            <xsl:value-of select="../@name"/>es
-          </xsl:when>
-          <xsl:when test="starts-with( substring(../@name, string-length(../@name) ), 'y')">
-            <xsl:value-of select="substring( ../@name, 0, string-length(../@name) )"/>ies
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="../@name"/>s
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      #capturefor( title)
-      <xsl:value-of select="normalize-space( concat( 'List ', $withpluralsuffix))"/>
-			#end
-			#capturefor( headextras)
-			<xsl:call-template name="head"/>
-			#end
-			<xsl:call-template name="top"/>
-			<xsl:call-template name="list">
-        <xsl:with-param name="list" select="."/>
-      </xsl:call-template>
-			<xsl:call-template name="foot"/>
-		</xsl:template>
+	  <xsl:template match="adl:property[@type='link']">
+		  <!-- note! this template is only intended to match properties in the context of a form:
+      it may be we need to add a mode to indicate this! -->
+		  <!-- for links we implement a shuffle widget, which extends over both columns -->
+		  <!-- TODO: Permissions! -->
+		  <xsl:param name="oddness" select="odd"/>
+		  <tr>
+			  <xsl:attribute name="class">
+				  <xsl:value-of select="$oddness"/>
+			  </xsl:attribute>
+			  <td class="label" rowspan="2">
+				  ${FormHelper.LabelFor( "instance.<xsl:value-of select="@name"/>", "<xsl:call-template name="showprompt">
+					  <xsl:with-param name="node" select="."/>
+					  <xsl:with-param name="fallback" select="@name"/>
+				  </xsl:call-template>")}
+			  </td>
+			  <td class="widget" colspan="2">
+				  <table>
+					  <tr>
+						  <td class="widget" rowspan="2">
+							  ${ShuffleWidgetHelper.UnselectedOptions( "<xsl:value-of select="concat( @name, '_unselected')"/>", <xsl:value-of select="concat( '$all_', @name)"/>, $instance.<xsl:value-of select="@name"/>)}
+						  </td>
+						  <td class="widget">
+							  <input type="button" value="include &gt;&gt;">
+								  <xsl:attribute name="onclick">
+									  <xsl:value-of select="concat( 'shuffle(', @name, '_unselected, ', @name, ')')"/>
+								  </xsl:attribute>
+							  </input>
+						  </td>
+						  <td class="widget" rowspan="2">
+							  ${ShuffleWidgetHelper.SelectedOptions( "<xsl:value-of select="@name"/>", $instance.<xsl:value-of select="@name"/>)}
+						  </td>
+					  </tr>
+					  <tr>
+						  <td class="widget">
+							  <input type="button" value="&lt;&lt; exclude">
+								  <xsl:attribute name="onclick">
+									  <xsl:value-of select="concat( 'shuffle(', @name, ', ', @name, '_unselected)')"/>
+								  </xsl:attribute>
+							  </input>
+						  </td>
+					  </tr>
+				  </table>
+			  </td>
+		  </tr>
+		  <tr>
+			  <xsl:attribute name="class">
+				  <xsl:choose>
+					  <xsl:when test="position() mod 2 = 0">even</xsl:when>
+					  <xsl:otherwise>odd</xsl:otherwise>
+				  </xsl:choose>
+			  </xsl:attribute>
+			  <td class="help" colspan="2">
+				  <xsl:apply-templates select="adl:help[@locale = $locale]"/>
+			  </td>
+		  </tr>
+	  </xsl:template>
 
-    <!-- layout of a list assuming an empty layout -->
+	  <xsl:template match="adl:property">
+		  <xsl:param name="oddness" select="odd"/>
+		  <!-- note! this template is only intended to match properties in the context of a form:
+			it may be we need to add a mode to indicate this! -->
+		  <!-- TODO: we really need to be able to handle different permissions for different 
+			groups. If the current user is not a member of a group which has read access to 
+			this widget, the widget shouldn't even appear (unless they have write but not read?); 
+			if they are not a member of a group which has write access, the widget should be 
+			disabled. I don't have time to implement this now as it is not trivial, but it is 
+			important! -->
+		  <xsl:variable name="permission">
+			  <xsl:call-template name="property-permission">
+				  <xsl:with-param name="property" select="."/>
+				  <xsl:with-param name="groupname" select ="$permissions-group"/>
+			  </xsl:call-template>
+		  </xsl:variable>
+		  <xsl:if test="$permission != 'none'">
+			  <tr>
+				  <xsl:attribute name="class">
+					  <xsl:value-of select="$oddness"/>
+				  </xsl:attribute>
+				  <td class="label">
+					  ${FormHelper.LabelFor( "instance.<xsl:value-of select="@name"/>", "<xsl:call-template name="showprompt">
+						  <xsl:with-param name="fallback" select="@name"/>
+					  </xsl:call-template>")}
+				  </td>
+				  <td class="widget">
+					  <xsl:variable name="render-mode">
+						  <xsl:choose>
+							  <xsl:when test="$permission='all'">edit</xsl:when>
+							  <xsl:when test="$permission='edit'">edit</xsl:when>
+							  <xsl:when test="$permission='noedit'">$maybe-edit</xsl:when>
+							  <xsl:when test="$permission='insert'">$maybe-edit</xsl:when>
+							  <xsl:when test="$permission='read'">noneditable</xsl:when>
+							  <xsl:otherwise>none</xsl:otherwise>
+						  </xsl:choose>
+					  </xsl:variable>
+					  <xsl:variable name="if-missing">
+						  <xsl:choose>
+							  <xsl:when test="adl:if-missing[@locale = $locale]">
+								  <xsl:value-of select="adl:if-missing[@locale = $locale]"/>
+							  </xsl:when>
+							  <xsl:when test="@required='true'">
+								  You must provide a value for <xsl:value-of select="@name"/>
+							  </xsl:when>
+							  <xsl:when test="@type='defined'">
+								  The value for <xsl:value-of select="@name"/> must be <xsl:value-of select="@definition"/>
+							  </xsl:when>
+							  <xsl:when test="@type='entity'">
+								  The value for <xsl:value-of select="@name"/> must be an instance of <xsl:value-of select="@entity"/>
+							  </xsl:when>
+							  <xsl:otherwise>
+								  The value for <xsl:value-of select="@name"/> must be <xsl:value-of select="@type"/>
+							  </xsl:otherwise>
+						  </xsl:choose>
+					  </xsl:variable>
+					  <xsl:variable name="definition" select="@typedef"/>
+					  <xsl:variable name="definedtype" select="//adl:typedef[@name=$definition]/@type"/>
+					  <xsl:variable name="base-type">
+						  <xsl:call-template name="base-type">
+							  <xsl:with-param name="property" select="."/>
+						  </xsl:call-template>
+					  </xsl:variable>
+					  <xsl:variable name="cssclass">
+						  <xsl:if test="@required='true'">required </xsl:if>
+						  <xsl:choose>
+							  <xsl:when test="@type='defined'">
+								  <xsl:choose>
+									  <xsl:when test="//adl:typedef[@name=$definition]/@pattern">
+										  <xsl:value-of select="concat( 'validate-custom-', $definition)"/>
+									  </xsl:when>
+									  <xsl:when test="//adl:typedef[@name=$definition]/@minimum">
+										  <xsl:value-of select="concat( 'validate-custom-', $definition)"/>
+									  </xsl:when>
+								  </xsl:choose>
+							  </xsl:when>
+							  <xsl:when test="$base-type='integer'">validate-digits</xsl:when>
+							  <xsl:when test="$base-type='real'">validate-number</xsl:when>
+							  <xsl:when test="$base-type='money'">validate-number</xsl:when>
+							  <xsl:when test="$base-type='date'">date-field validate-date</xsl:when>
+						  </xsl:choose>
+					  </xsl:variable>
+					  <xsl:variable name="maxlength">
+						  <xsl:call-template name="base-size">
+							  <xsl:with-param name="property" select="."/>
+						  </xsl:call-template>
+					  </xsl:variable>
+					  <xsl:variable name="size">
+						  <xsl:choose>
+							  <xsl:when test="$maxlength &gt; $max-widget-width">
+								  <xsl:value-of select="$max-widget-width"/>
+							  </xsl:when>
+							  <xsl:otherwise>
+								  <xsl:value-of select="$maxlength"/>
+							  </xsl:otherwise>
+						  </xsl:choose>
+					  </xsl:variable>
+					  <xsl:variable name="rows">
+						  <xsl:choose>
+							  <xsl:when test="$base-type = 'text'">8</xsl:when>
+							  <xsl:otherwise>1</xsl:otherwise>
+						  </xsl:choose>
+					  </xsl:variable>
+					  <xsl:if test="$permission='insert' or $permission='noedit'">
+						  #set ( $maybe-edit="editable")
+						  #if ( $instance)
+						  #if ( <xsl:value-of select="concat( '$instance.', @name)"/>)
+						  <xsl:choose>
+							  <xsl:when test="$permission='insert'">
+								  #set ( $maybe-edit="none")
+							  </xsl:when>
+							  <xsl:when test="$permission='noedit'">
+								  #set ( $maybe-edit="noneditable")
+							  </xsl:when>
+						  </xsl:choose>
+						  #set( $maybe-edit="editable")
+						  #end
+						  #end
+					  </xsl:if>
+					  ${<xsl:value-of select="concat( ancestor::adl:entity/@name, 'FieldHelper')"/>.Editable( "<xsl:value-of select="concat( 'instance.', @name)"/>", "%{rendermode='<xsl:value-of select="normalize-space($render-mode)"/>',class='<xsl:value-of select="normalize-space($cssclass)"/>',title='<xsl:value-of select="normalize-space($if-missing)"/>',size='<xsl:value-of select="normalize-space($size)"/>',maxlength='<xsl:value-of select="normalize-space($maxlength)"/>',rows='<xsl:value-of select="normalize-space($rows)"/>'}")}
+				  </td>
+				  <td class="help">
+					  <xsl:apply-templates select="adl:help[@locale = $locale]"/>
+				  </td>
+			  </tr>
+		  </xsl:if>
+	  </xsl:template>
+
+
+	  <!-- layout of lists -->
+	  <!-- layout of a list assuming a non-empty layout -->
+	  <xsl:template match="adl:list" mode="non-empty-layout">
+		  <xsl:text>
+		  </xsl:text>
+		  <xsl:comment>[ cut here: next file '<xsl:value-of select="concat( ../@name, '/', @name)"/>.auto.vm' ]</xsl:comment>
+		  <xsl:text>
+          </xsl:text>
+		  <xsl:variable name="withpluralsuffix">
+			  <!-- English-laguage syntactic sugar of entity name -->
+			  <xsl:choose>
+				  <xsl:when test="../@name='Person'">People</xsl:when>
+				  <xsl:when test="starts-with( substring(../@name, string-length(../@name) ), 's')">
+					  <xsl:value-of select="../@name"/>es
+				  </xsl:when>
+				  <xsl:when test="starts-with( substring(../@name, string-length(../@name) ), 'y')">
+					  <xsl:value-of select="substring( ../@name, 0, string-length(../@name) )"/>ies
+				  </xsl:when>
+				  <xsl:otherwise>
+					  <xsl:value-of select="../@name"/>s
+				  </xsl:otherwise>
+			  </xsl:choose>
+		  </xsl:variable>
+		  #capturefor( title)
+		  <xsl:value-of select="normalize-space( concat( 'List ', $withpluralsuffix))"/>
+		  #end
+		  #capturefor( headextras)
+		  <xsl:call-template name="head"/>
+		  #end
+		  <xsl:call-template name="top"/>
+		  <xsl:call-template name="list">
+			  <xsl:with-param name="list" select="."/>
+		  </xsl:call-template>
+		  <xsl:call-template name="foot"/>
+	  </xsl:template>
+
+	  <!-- layout of a list assuming an empty layout -->
     <xsl:template match="adl:list" mode="empty-layout">
       <xsl:variable name="action" select="@onselect"/>
       <xsl:text>
-    </xsl:text>
+      </xsl:text>
       <xsl:comment>[ cut here: next file '<xsl:value-of select="concat( ../@name, '/', @name)"/>.auto.vm' ]</xsl:comment>
       <xsl:text>
-    </xsl:text>
+      </xsl:text>
       <xsl:variable name="withpluralsuffix">
         <!-- English-laguage syntactic sugar of entity name. TODO (bug 1896): This really /must/ not be here.
 					some means of doing i18n syntactic sugar needs to be spliced in. -->
@@ -1359,7 +1120,7 @@
             Auto generated Velocity list for <xsl:value-of select="ancestor::adl:entity/@name"/>,
             generated from ADL.
 
-            Generated using adl2listview.xsl <xsl:value-of select="substring( '$Revision: 1.17 $', 10)"/>
+            Generated using adl2listview.xsl <xsl:value-of select="substring( '$Revision: 1.18 $', 10)"/>
           </xsl:comment>
           <xsl:call-template name="install-scripts"/>
         </head>
diff --git a/transforms01/base-type-include.xslt b/transforms01/base-type-include.xslt
index 25bc009..35d6547 100755
--- a/transforms01/base-type-include.xslt
+++ b/transforms01/base-type-include.xslt
@@ -10,8 +10,8 @@
     one place for ease of maintenance
     
     $Author: sb $
-    $Revision: 1.4 $
-    $Date: 2008-02-27 17:38:41 $
+    $Revision: 1.5 $
+    $Date: 2008-05-16 15:26:20 $
   -->
 
 <xsl:stylesheet version="1.0"
@@ -21,38 +21,55 @@
   exclude-result-prefixes="adl">
 
 
-  <!-- return the base ADL type of the property which is passed as a parameter -->
-  <xsl:template name="base-type">
-    <xsl:param name="property"/>
-    <xsl:choose>
-      <xsl:when test="$property/@type='defined'">
-        <xsl:variable name="definition">
-          <xsl:value-of select="$property/@typedef"/>
-        </xsl:variable>
-        <xsl:value-of select="/adl:application/adl:typedef[@name=$definition]/@type"/>
-      </xsl:when>
-      <xsl:when test="$property/@type='serial'">integer</xsl:when>
-      <xsl:when test="$property/@type='message'">integer</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$property/@type"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
+	<!-- return the base ADL type of the property which is passed as a parameter -->
+	<xsl:template name="base-type">
+		<xsl:param name="property"/>
+		<xsl:choose>
+			<xsl:when test="$property/@type='defined'">
+				<xsl:variable name="definition">
+					<xsl:value-of select="$property/@typedef"/>
+				</xsl:variable>
+				<xsl:value-of select="/adl:application/adl:typedef[@name=$definition]/@type"/>
+			</xsl:when>
+			<xsl:when test="$property/@type='serial'">integer</xsl:when>
+			<xsl:when test="$property/@type='message'">integer</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="$property/@type"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
 
-  <!-- return the size of the type of the property which is passed as a parameter -->
-  <xsl:template name="base-size">
-    <xsl:param name="property"/>
-    <xsl:choose>
-      <xsl:when test="$property/@type='defined'">
-        <xsl:variable name="definition">
-          <xsl:value-of select="$property/@typedef"/>
-        </xsl:variable>
-        <xsl:value-of select="/adl:application/adl:typedef[@name=$definition]/@size"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$property/@size"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
+	<!-- return the size of the type of the property which is passed as a parameter -->
+	<xsl:template name="base-size">
+		<xsl:param name="property"/>
+		<xsl:variable name="base-type">
+			<xsl:call-template name="base-type">
+				<xsl:with-param name="property" select="$property"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$property/@type='defined'">
+				<xsl:variable name="definition">
+					<xsl:value-of select="$property/@typedef"/>
+				</xsl:variable>
+				<xsl:value-of select="/adl:application/adl:typedef[@name=$definition]/@size"/>
+			</xsl:when>
+			<!-- type='text' should really be unlimited, but in the real world it isn't. 
+			Furthermore, setting null values may currently break the smart form components 
+			parser -->
+			<xsl:when test="$base-type='text'">4294967296</xsl:when>
+			<xsl:when test="$base-type='integer'">8</xsl:when>
+			<xsl:when test="$base-type='real'">8</xsl:when>
+			<xsl:when test="$base-type='money'">10</xsl:when>
+			<xsl:when test="$base-type='date'">10</xsl:when>
+			<xsl:when test="$base-type='time'">8</xsl:when>
+			<xsl:when test="$property/@size &gt; 0">
+				<xsl:value-of select="$property/@size"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="$base-type"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
 
-</xsl:stylesheet> 
+</xsl:stylesheet>