--- trunk/lib/Frey/Server.pm	2008/07/13 19:46:10	120
+++ trunk/lib/Frey/Server.pm	2008/07/14 21:22:43	121
@@ -8,7 +8,7 @@
 #use Continuity::REPL;
 use Data::Dump qw/dump/;
 
-#use Carp::REPL;
+use Carp::REPL;
 use Frey::ClassLoader;
 
 my @messages;    # Global (shared) list of messages
@@ -57,6 +57,8 @@
 			$f = Frey::ObjectBrowser->new( fey_class => $1 );
 		} elsif ( $path =~ m!/od/([^/]+)(.*)! ) {
 			$f = Frey::ObjectDesigner->new( fey_class => $1 );
+		} else {
+			$f = Frey::ClassBrowser->new;
 		}
 		$f->html( $req ) if $f;
 
@@ -66,13 +68,7 @@
 		warn $@;
 		#$req->conn->send_error( 404 );	# FIXME this should probably be 500, but we can't ship page with it
 		$req->print( qq{<pre class="error">$@<pre>} );
-#		Carp::REPL::repl;	# FIXME if $self->debug
-	} else {
-
-		$req->print(
-			qq|<h1>Classes</h1>\n<div class="sidebar"><a href="/reload">reload</a></div>| .
-			Frey::ClassBrowser->new->html_markup
-		);
+		Carp::REPL::repl;	# FIXME if $self->debug
 
 	}
 
@@ -80,7 +76,11 @@
 	if($path =~ /pushstream/) {
 		pushstream($req);
 	}
-  
+
+	if ( $path =~ m/die/ ) {
+		Carp::REPL::repl;	# FIXME if $self->debug
+	}
+
 	# If they are sending us a message, we give them a thread for that too
 	if($path =~ /sendmessage/) {
 		send_message($req);