--- trunk/lib/Frey/Web/Item.pm	2008/07/16 23:21:19	153
+++ trunk/lib/Frey/ORM/Item.pm	2009/01/09 16:02:33	969
@@ -1,19 +1,24 @@
-package Frey::Web::Item;
+package Frey::ORM::Item;
 
 use Data::Dump qw/dump/;
 use Carp qw/carp/;
 
 use Moose;
 extends 'Frey';
-with 'Frey::Web::Field';
-with 'Frey::Web::Layout';
+with 'Frey::ORM::Field';
+with 'Frey::ORM::Layout';
 with 'Frey::Storage';
 #with 'BonusTypes';
 
 use Moose::Util::TypeConstraints;
 
 enum 'Render_as' => qw( view edit none );
-has render_as => ( is => 'rw', isa => 'Render_as', required => 1, default => 'view' );
+has render_as => (
+	is => 'rw',
+	isa => 'Render_as',
+	required => 1,
+	default => 'view',
+);
 
 has fey => (
 	is => 'rw',
@@ -69,22 +74,19 @@
 
 	warn "# item ",$self->uuid, " fey = ",dump( $self->fey ) if $self->debug;
 
-	while(1) {
-    	my $out;
-		if ( $self->render_as eq 'edit' ) {
-			$out .= $self->render_edit;
-		} elsif ( $self->render_as eq 'view' ) {
-			$out .= $self->render_view;
-		} else {
-			warn "no renderer ",dump( $self->render_as ), " skipping...";
-		}
-
-		warn $@ if $@;
-		warn ">>> ",length($out),"\n";
-		my $f = $self->next($out);
-		$self->set_from_hash($f);
-		$self->exec_callbacks($f) if $self->can('exec_callbacks');
+	my $out;
+	if ( $self->render_as eq 'edit' ) {
+		$out .= $self->render_edit;
+	} elsif ( $self->render_as eq 'view' ) {
+		$out .= $self->render_view;
+	} else {
+		warn "no renderer ",dump( $self->render_as ), " skipping...";
 	}
+
+	warn $@ if $@;
+	warn ">>> ",length($out),"\n";
+
+	return $out;
 };
 
 sub field_value {