--- trunk/lib/Frey/Run.pm	2008/11/06 20:25:27	326
+++ trunk/lib/Frey/Run.pm	2008/11/08 23:03:35	336
@@ -1,6 +1,7 @@
 package Frey::Run;
 use Moose;
-extends 'Frey::ClassLoader';
+#extends 'Frey::ClassLoader';
+extends 'Frey::PPI';
 with 'Frey::Web';
 with 'Frey::Config';
 with 'Frey::Escape';
@@ -57,9 +58,15 @@
 	warn "# $class config = ",dump( $values );
 
 	if ( @required ) {
-		$html = qq|<h1>Required params for $class</h1><form method="post">|;
-		foreach my $attr ( @required ) {
-			my $name = $attr->name;
+		$html = qq|<h1>$class params</h1><form method="post">|;
+
+		my $a;
+		my @attrs = map {  $a->{$_}++; $_ } $self->attribute_order;
+		push @attrs, $_ foreach grep { ! $a->{$_} } map { $_->name } @required;
+		warn "# attrs = ",dump( @attrs );
+
+		foreach my $name ( @attrs ) {
+			my $attr = $class->meta->get_attribute( $name );
 			my $type = $name =~ m/^pass/ ? 'password' : 'text';
 			my $value =
 				$values ? $values->{$name} :
@@ -83,7 +90,7 @@
 		} elsif ( $o->can('data') ) {
 			my $data = $o->data;
 			$html .= Frey::Dumper->new( data => $data )->markup;
-			$html .= '<hr/><code>' . $self->html_escape( dump( $data ) ) . '</code>';
+			$html .= '<hr/><code>' . $self->html_dump( $data ) . '</code>';
 		} else {
 			$html = "IGNORE: $class ", $o->dump;
 			warn $html;