diff --git a/TODO b/TODO
index 909e8370b..3ee21a684 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,7 @@
 TODO
 * Deprecate WebGUI::Session::HTTP - replace with WebGUI::Request/Response
 * Turn logger into $self->request->env->{'psgi.errors'}->print(join '', @stuff);
+* Remove WebGUI::Session::Output
 
 DONE
 * $session->request is now a Plack::Request object
diff --git a/lib/WebGUI/Session/Output.pm b/lib/WebGUI/Session/Output.pm
index 89640757f..98dcbea63 100644
--- a/lib/WebGUI/Session/Output.pm
+++ b/lib/WebGUI/Session/Output.pm
@@ -90,27 +90,18 @@ sub print {
     my $content    = shift;
     my $skipMacros = shift || !($self->session->http->getMimeType =~ /^text/);
     WebGUI::Macro::process($self->session, \$content) unless $skipMacros;
-    my $handle = $self->{_handle};
-    if (defined $handle) {
-        print $handle $content;
-    }
-    elsif ($self->session->request) {
-        # TODO - put in IO bound delayed response
-        $self->session->response->body( $self->session->response->body() . $content );
-#        if (ref $self->session->request->body eq 'ARRAY') {
-#            push @{$self->session->request->body}, $content;
-#        } else {
-#            if ($self->session->request->logger) {
-#                $self->session->request->logger->({ level => 'warn', message => "dropping content: $content" });
-#            } else {
-#                warn "dropping content";#: $content";
-#            }
-#        }
-#        $self->session->request->print($content);
-    }
-    else {
-        print $content;
+    
+    # Initialise response body if it's empty
+    $self->session->response->body([]) if !$self->session->response->body;
+    
+    my $body = $self->session->response->body;
+    if (ref $body ne 'ARRAY') {
+        Carp::carp("Response body is not an ARRAY, it's a " . ref $body);
+        return;
     }
+    push @{ $body }, $content;
+    
+    # TODO - put in IO bound delayed response
 }
 
 #-------------------------------------------------------------------