diff --git a/lib/Lacuna/RPC/Alliance.pm b/lib/Lacuna/RPC/Alliance.pm
index f6239066..467c4352 100644
--- a/lib/Lacuna/RPC/Alliance.pm
+++ b/lib/Lacuna/RPC/Alliance.pm
@@ -28,7 +28,7 @@ sub find {
         $limit--;
         last unless $limit;
     }
-    return { alliances => \@list_of_alliances, status => $self->format_status($empire) };
+    return { alliances => \@list_of_alliances, status => $self->format_status($session) };
 }
 
 
@@ -71,7 +71,7 @@ sub view_profile {
         space_stations  => \@stations_list,
         influence       => $influence,
     );
-    return { profile => \%out, status => $self->format_status($empire) };
+    return { profile => \%out, status => $self->format_status($session) };
 }
 
 
diff --git a/lib/Lacuna/RPC/Body.pm b/lib/Lacuna/RPC/Body.pm
index 6bf2ea1c..a81df078 100644
--- a/lib/Lacuna/RPC/Body.pm
+++ b/lib/Lacuna/RPC/Body.pm
@@ -18,7 +18,7 @@ sub get_status {
     my $session = $self->get_session({session_id => $session_id, body_id => $body_id});
     my $empire = $session->current_empire;
     my $body =   $session->current_body;
-    return $self->format_status($empire, $body);
+    return $self->format_status($session, $body);
 }
 
 sub get_body_status {
@@ -31,7 +31,7 @@ sub get_body_status {
 
     return {
         body    => $body->get_status,
-        status  => $self->format_status($empire),
+        status  => $self->format_status($session),
     };
 }
 
@@ -54,7 +54,7 @@ sub abandon {
     }
     $body->abandon;
     $empire->add_medal('abandoned_colony');
-    return $self->format_status($empire);
+    return $self->format_status($session);
 }
 
 sub rename {
@@ -135,7 +135,7 @@ sub get_buildings {
         }
     }
     
-    return {buildings=>\%out, body=>{surface_image => $body->surface}, status=>$self->format_status($empire, $body)};
+    return {buildings=>\%out, body=>{surface_image => $body->surface}, status=>$self->format_status($session, $body)};
 }
 
 sub repair_list {
@@ -188,7 +188,7 @@ sub repair_list {
     }
     return {
         buildings=>\%out,
-        status=>$self->format_status($empire, $body)
+        status=>$self->format_status($session, $body)
     };
 }
 
@@ -292,7 +292,7 @@ sub rearrange_buildings {
   }
   return { moved => \@moved,
            body => {surface_image => $body->surface},
-           status => $self->format_status($empire, $body)};
+           status => $self->format_status($session, $body)};
 }
 
 sub check_positions {
@@ -523,7 +523,7 @@ sub get_buildable {
         }
     }
 
-    return {buildable=>\%out, build_queue => { max => $max_items_in_build_queue, current => $items_in_build_queue}, status=>$self->format_status($empire, $body)};
+    return {buildable=>\%out, build_queue => { max => $max_items_in_build_queue, current => $items_in_build_queue}, status=>$self->format_status($session, $body)};
 }
 
 sub get_buildable_locations {
@@ -536,7 +536,7 @@ sub get_buildable_locations {
     $args{size} = $opts->{size} if $opts->{size} and $opts->{size} ~~ [1,4,9];
 
     return {
-        status => $self->format_status($empire, $body),
+        status => $self->format_status($session, $body),
         unoccupied => $body->find_free_spaces(\%args),
     }
 }
@@ -554,13 +554,13 @@ sub view_laws {
             push @out, $law->get_status($empire);
         }
         return {
-            status          => $self->format_status($empire, $body),
+            status          => $self->format_status($session, $body),
             laws            => \@out,
         };
     }
     else {
         return {
-            status => $self->format_status($empire, $body),
+            status => $self->format_status($session, $body),
             laws   => [ { name => "Not a Station",
                           descripition => "Not a Station",
                           date_enacted => "00 00 0000 00:00:00 +0000",
@@ -585,7 +585,7 @@ sub set_colony_notes
     $body->update;
 
     return {
-        status => $self->format_status($empire, $body),
+        status => $self->format_status($session, $body),
     };
 }
 
diff --git a/lib/Lacuna/RPC/Building.pm b/lib/Lacuna/RPC/Building.pm
index f8bc672c..e75ae6a6 100644
--- a/lib/Lacuna/RPC/Building.pm
+++ b/lib/Lacuna/RPC/Building.pm
@@ -66,7 +66,7 @@ sub upgrade {
     # The cache needs clearing so the build queue length can be set properly
     $body->clear_building_cache;
     return {
-        status      => $self->format_status($empire, $body),
+        status      => $self->format_status($session, $body),
         building    => {
             id              => $building->id,
             level           => $building->level,
@@ -198,7 +198,7 @@ sub build {
     $body->clear_building_count;
     # show the user
     my %out = (
-        status      => $self->format_status($empire, $body),
+        status      => $self->format_status($session, $body),
         building    => {
             id              => $building->id,
             level           => $building->level,
@@ -245,7 +245,7 @@ sub demolish {
     $building->demolish;
     $body->tick;
     return {
-        status      => $self->format_status($empire, $body),
+        status      => $self->format_status($session, $body),
     };
 }
 
@@ -315,7 +315,7 @@ sub get_stats_for_level {
                 image           => $image_after_upgrade,
             },
         },
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
     };
 }
 
diff --git a/lib/Lacuna/RPC/Building/Archaeology.pm b/lib/Lacuna/RPC/Building/Archaeology.pm
index 4aa940b2..5af56ff8 100644
--- a/lib/Lacuna/RPC/Building/Archaeology.pm
+++ b/lib/Lacuna/RPC/Building/Archaeology.pm
@@ -43,7 +43,7 @@ sub get_glyphs {
     }
     return {
         glyphs  => \@out,
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
     };
 }
 
@@ -66,7 +66,7 @@ sub get_glyph_summary {
 
     return {
         glyphs  => \@out,
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
     };
 }
 
@@ -77,7 +77,7 @@ sub get_ores_available_for_processing {
     my $building = $session->current_building;
     return {
         ore                 => $building->get_ores_available_for_processing,
-        status              => $self->format_status($empire, $building->body),
+        status              => $self->format_status($session, $building->body),
     };
 }
 
@@ -107,7 +107,7 @@ sub assemble_glyphs {
     return {
         item_name           => $plan->class->name,
         quantity            => $quantity,
-        status              => $self->format_status($empire, $building->body),
+        status              => $self->format_status($session, $building->body),
     };
 }
 
@@ -183,7 +183,7 @@ sub view_excavators {
         excavators       => \@sites,
         max_excavators   => $building->max_excavators,
         travelling       => $travel,
-        status           => $self->format_status($empire, $building->body),
+        status           => $self->format_status($session, $building->body),
     };
 }
 
@@ -201,7 +201,7 @@ sub abandon_excavator {
     }
     $building->remove_excavator($site);
     return {
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
     };
 }
 
@@ -212,7 +212,7 @@ sub mass_abandon_excavator {
     my $building = $session->current_building;
     $building->excavators->delete;
 	return {
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
     }; 
 }
 
diff --git a/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm b/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm
index 5d18ddaf..2b2ad1bb 100644
--- a/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm
+++ b/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm
@@ -292,7 +292,7 @@ sub get_actions_for {
         }
     }
     return {
-        status => $self->format_status($empire, $body),
+        status => $self->format_status($session, $body),
         tasks  => \@tasks
     };
 }
@@ -757,7 +757,7 @@ sub generate_singularity {
                 $body->add_news(75, 'Scientists revolt against %s for despicable practices.', $empire->name);
                 $effect->{fail} = bhg_self_destruct($building);
                 return {
-                    status => $self->format_status($empire, $body),
+                    status => $self->format_status($session, $body),
                     effect => $effect,
                 };
             }
@@ -772,7 +772,7 @@ sub generate_singularity {
             );
             $effect->{fail} = bhg_self_destruct($building);
             return {
-                status => $self->format_status($empire, $body),
+                status => $self->format_status($session, $body),
                 effect => $effect,
             };
         }
@@ -1201,7 +1201,7 @@ sub generate_singularity {
     }
     
     return {
-        status => $self->format_status($empire, $body),
+        status => $self->format_status($session, $body),
         effect => $effect,
     };
 }
diff --git a/lib/Lacuna/RPC/Building/Capitol.pm b/lib/Lacuna/RPC/Building/Capitol.pm
index 7eefe14c..d6e5f20b 100644
--- a/lib/Lacuna/RPC/Building/Capitol.pm
+++ b/lib/Lacuna/RPC/Building/Capitol.pm
@@ -48,7 +48,7 @@ sub rename_empire {
     $cache->set('rename_empire_lock', $empire->id, 1, 60 * 60 * 24);
 
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
     };
 }
 
diff --git a/lib/Lacuna/RPC/Building/Embassy.pm b/lib/Lacuna/RPC/Building/Embassy.pm
index 8d5919e5..e8db3673 100644
--- a/lib/Lacuna/RPC/Building/Embassy.pm
+++ b/lib/Lacuna/RPC/Building/Embassy.pm
@@ -42,7 +42,7 @@ sub assign_alliance_leader {
     }
     $building->assign_alliance_leader($new_leader);
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
         alliance        => $building->alliance->get_status,
     };
 }
@@ -54,7 +54,7 @@ sub create_alliance {
     my $building = $session->current_building;
     my $alliance = $building->create_alliance($name);
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
         alliance        => $alliance->get_status,
     };
 }
@@ -65,7 +65,7 @@ sub get_alliance_status {
     my $empire   = $session->current_empire;
     my $building = $session->current_building;
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
         alliance        => $building->get_alliance_status,
     };
 }
@@ -78,7 +78,7 @@ sub dissolve_alliance {
     $building->dissolve_alliance;
     $empire->discard_changes;
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
     };
 }
 
@@ -89,7 +89,7 @@ sub leave_alliance {
     my $building = $session->current_building;
     $building->leave_alliance($message);
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
     };
 }
 
@@ -142,7 +142,7 @@ sub reject_invite {
     }
     $building->reject_invite($invite, $message);
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
     };
 }
 
@@ -160,7 +160,7 @@ sub withdraw_invite {
     }
     $building->withdraw_invite($invite, $message);
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
     };
 }
 
@@ -178,7 +178,7 @@ sub send_invite {
     }
     $building->send_invite($invitee, $message);
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
     };
 }
 
@@ -189,7 +189,7 @@ sub get_pending_invites {
     my $building = $session->current_building;
     return {
         invites         => $building->get_pending_invites,
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
     };
 }
 
@@ -200,7 +200,7 @@ sub get_my_invites {
     my $building = $session->current_building;
     return {
         invites         => $building->get_my_invites,
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
     };
 }
 
@@ -213,7 +213,7 @@ sub update_alliance {
     my $alliance = $building->update_alliance($params);
     return {
         alliance        => $alliance->get_status,
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
     };
 }
 
@@ -229,7 +229,7 @@ sub view_stash {
     }
     return {
         stash           => $building->alliance->stash || {},
-        status          => $self->format_status($empire, $body),
+        status          => $self->format_status($session, $body),
         max_exchange_size   => $building->max_exchange_size,
         exchanges_remaining_today   => $building->exchanges_remaining_today,
         stored          => \%stored,
@@ -266,7 +266,7 @@ sub view_propositions {
         push @out, $proposition->get_status($empire);
     }
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
         propositions    => \@out,
     };
 }
@@ -293,7 +293,7 @@ sub cast_vote {
 
     $proposition->cast_vote($empire, $vote);
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
diff --git a/lib/Lacuna/RPC/Building/EnergyReserve.pm b/lib/Lacuna/RPC/Building/EnergyReserve.pm
index 93c1e528..314cf3c5 100644
--- a/lib/Lacuna/RPC/Building/EnergyReserve.pm
+++ b/lib/Lacuna/RPC/Building/EnergyReserve.pm
@@ -26,7 +26,7 @@ sub dump {
     $body->add_type('waste', $amount);
     $body->update;
     return {
-        status      => $self->format_status($empire, $body),
+        status      => $self->format_status($session, $body),
         };
 }
 
diff --git a/lib/Lacuna/RPC/Building/Entertainment.pm b/lib/Lacuna/RPC/Building/Entertainment.pm
index bd215227..beb63ef1 100644
--- a/lib/Lacuna/RPC/Building/Entertainment.pm
+++ b/lib/Lacuna/RPC/Building/Entertainment.pm
@@ -48,7 +48,7 @@ sub get_lottery_voting_options {
     }
     return {
         options         => \@list,
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
     };
 }
 
@@ -69,6 +69,7 @@ my @quacks = (
     "       ,~~.\n      (  6 )-_,\n (\___ )=='-'\n  \ .   ) )\n   \ `-' /       \n~'`~'`~'`~'`~",
     "    ,,,,,\n   (o   o)\n    /. .\ \n   (_____)\n     : :\n    ##O##\n  ,,,: :,,,\n _)\ : : /(____\n{  \     /  ___}\n \/)     ((/\n  (_______)\n    :   :\n    :   :\n   / \ / \\n   \"\"\" \"\"\"",
     "What's up, doc?",
+    "I may quack like a duck and walk like a duck, but I'm really a rabbit in disguise!",
 );
 
 sub duck_quack {
diff --git a/lib/Lacuna/RPC/Building/FoodReserve.pm b/lib/Lacuna/RPC/Building/FoodReserve.pm
index 6bfb6b78..d2dc85a4 100644
--- a/lib/Lacuna/RPC/Building/FoodReserve.pm
+++ b/lib/Lacuna/RPC/Building/FoodReserve.pm
@@ -42,7 +42,7 @@ sub dump {
     $body->add_type('waste', $amount);
     $body->update;
     return {
-        status      => $self->format_status($empire, $body),
+        status      => $self->format_status($session, $body),
     };
 }
 
diff --git a/lib/Lacuna/RPC/Building/GeneticsLab.pm b/lib/Lacuna/RPC/Building/GeneticsLab.pm
index e5888b75..472c2e99 100644
--- a/lib/Lacuna/RPC/Building/GeneticsLab.pm
+++ b/lib/Lacuna/RPC/Building/GeneticsLab.pm
@@ -20,7 +20,7 @@ sub prepare_experiment {
     my $empire   = $session->current_empire;
     my $building = $session->current_building;
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
         survival_odds   => $building->survival_odds,
         graft_odds      => $building->graft_odds,
         grafts          => $building->get_possible_grafts,
diff --git a/lib/Lacuna/RPC/Building/Intelligence.pm b/lib/Lacuna/RPC/Building/Intelligence.pm
index 1711cf68..c4d1487f 100644
--- a/lib/Lacuna/RPC/Building/Intelligence.pm
+++ b/lib/Lacuna/RPC/Building/Intelligence.pm
@@ -46,7 +46,7 @@ sub view_spies {
     }
     my @assignments = Lacuna::DB::Result::Spies->assignments;
     return {
-        status                  => $self->format_status($empire, $body),
+        status                  => $self->format_status($session, $body),
         spies                   => \@spies,
         possible_assignments    => \@assignments,
         spy_count               => $spy_list->pager->total_entries,
@@ -76,7 +76,7 @@ sub view_all_spies {
     }
     my @assignments = Lacuna::DB::Result::Spies->assignments;
     return {
-        status                  => $self->format_status($empire, $body),
+        status                  => $self->format_status($session, $body),
         spies                   => \@spies,
         possible_assignments    => \@assignments,
         spy_count               => scalar @spies,
@@ -107,7 +107,7 @@ sub view_all_spies {
 #     }
 #     my @assignments = Lacuna::DB::Result::Spies->assignments;
 #     return {
-#         status                  => $self->format_status($empire, $body),
+#         status                  => $self->format_status($session, $body),
 #         spies                   => \@spies,
 #         possible_assignments    => \@assignments,
 #         spy_count               => scalar @spies,
@@ -165,7 +165,7 @@ sub assign_spy {
     }
     my $mission = $spy->assign($assignment);
     return {
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
         mission => $mission,
         spy     => $spy->get_status,
     };
@@ -191,7 +191,7 @@ sub burn_spy {
     }
     $spy->burn;
     return {
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
     };
 }
 
@@ -233,7 +233,7 @@ sub train_spy {
         }
     }
     my $ret = {
-        status  => $self->format_status($empire, $body),
+        status  => $self->format_status($session, $body),
         trained => $trained,
         not_trained => $quantity - $trained,
         building                    => {
@@ -278,7 +278,7 @@ sub name_spy {
     $spy->name($name);
     $spy->update;
     return {
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
     };
     
 }
diff --git a/lib/Lacuna/RPC/Building/LibraryOfJith.pm b/lib/Lacuna/RPC/Building/LibraryOfJith.pm
index 887974f7..52cb536d 100644
--- a/lib/Lacuna/RPC/Building/LibraryOfJith.pm
+++ b/lib/Lacuna/RPC/Building/LibraryOfJith.pm
@@ -30,7 +30,7 @@ sub research_species {
     $building->start_work({}, 15 + ((60 * 60) * ((30-$building->effective_level)/30)));
 
     return {
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
         species => {
             name                    => $view_empire->species_name,
             description             => $view_empire->species_description,
diff --git a/lib/Lacuna/RPC/Building/MercenariesGuild.pm b/lib/Lacuna/RPC/Building/MercenariesGuild.pm
index e8681d60..14f4b8c8 100644
--- a/lib/Lacuna/RPC/Building/MercenariesGuild.pm
+++ b/lib/Lacuna/RPC/Building/MercenariesGuild.pm
@@ -26,7 +26,7 @@ sub get_trade_ships {
         push @ships, $ship->get_status($target);
     }
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         ships       => \@ships,
     };
 }
@@ -50,7 +50,7 @@ sub withdraw_from_market {
     }
     $trade->withdraw($building->body);
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
     };
 }
 
@@ -132,7 +132,7 @@ sub accept_from_market {
     $trade->delete;
 
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
     };
 }
 
@@ -154,7 +154,7 @@ sub add_to_market {
     $empire->update;
     return {
         trade_id    => $trade->id,
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
     };
 }
 
@@ -178,7 +178,7 @@ sub view_my_market {
         trades      => \@trades,
         trade_count => $my_trades->pager->total_entries,
         page_number => $page_number,
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
     };
 }
 
@@ -216,7 +216,7 @@ sub view_market {
         trades      => \@trades,
         trade_count => $all_trades->pager->total_entries,
         page_number => $page_number,
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
     };
 }
 
@@ -244,7 +244,7 @@ sub get_spies {
     }
     return {
         spies                   => \@out,
-        status                  => $self->format_status($empire, $building->body),
+        status                  => $self->format_status($session, $building->body),
     };
 }
 
@@ -276,7 +276,7 @@ sub report_abuse {
             $trade->withdraw($trade->body);
         }
         return {
-            status      => $self->format_status($empire, $building->body),
+            status      => $self->format_status($session, $building->body),
         };
     }
 }
diff --git a/lib/Lacuna/RPC/Building/MiningMinistry.pm b/lib/Lacuna/RPC/Building/MiningMinistry.pm
index 29d73d41..23329ea2 100644
--- a/lib/Lacuna/RPC/Building/MiningMinistry.pm
+++ b/lib/Lacuna/RPC/Building/MiningMinistry.pm
@@ -37,7 +37,7 @@ sub view_ships {
     }
     return {
         ships           => \@fleet,
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
     };
 }
 
@@ -78,7 +78,7 @@ sub view_platforms {
     return {
         platforms       => \@fleet,
         max_platforms   => $building->max_platforms,
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
     };
 }
 
@@ -96,7 +96,7 @@ sub abandon_platform {
     }
     $building->remove_platform($platform);
     return {
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
     };
 }
 
@@ -107,7 +107,7 @@ sub mass_abandon_platform {
     my $building = $session->current_building;
     $building->platforms->delete;
     return {
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
     }; 
 }
 
@@ -134,7 +134,7 @@ sub add_cargo_ship_to_fleet {
     }
     $building->add_ship($ship);
     return {
-        status  =>$self->format_status($empire, $building->body),
+        status  =>$self->format_status($session, $building->body),
     };
 }
 
@@ -165,7 +165,7 @@ sub remove_cargo_ship_from_fleet {
         $ship->land->update;
     }
     return {
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
     };
 }
 
diff --git a/lib/Lacuna/RPC/Building/MissionCommand.pm b/lib/Lacuna/RPC/Building/MissionCommand.pm
index 9b968087..2291be31 100644
--- a/lib/Lacuna/RPC/Building/MissionCommand.pm
+++ b/lib/Lacuna/RPC/Building/MissionCommand.pm
@@ -45,7 +45,7 @@ sub get_missions {
         last if ($count >= $building->effective_level);
     }
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         missions    => \@missions,
     };
 }
@@ -66,7 +66,7 @@ sub complete_mission {
     $mission->check_objectives($body);
     $mission->complete($body);
     return {
-        status      => $self->format_status($empire, $body),
+        status      => $self->format_status($session, $body),
     }
 }
 
@@ -81,7 +81,7 @@ sub skip_mission {
     my $body = $building->body;
     $mission->skip($body);
     return {
-        status      => $self->format_status($empire, $body),
+        status      => $self->format_status($session, $body),
     }
 }
 
diff --git a/lib/Lacuna/RPC/Building/Network19.pm b/lib/Lacuna/RPC/Building/Network19.pm
index 6e856d42..6677b5fd 100644
--- a/lib/Lacuna/RPC/Building/Network19.pm
+++ b/lib/Lacuna/RPC/Building/Network19.pm
@@ -49,7 +49,7 @@ sub view_news {
     return {
         news    => \@stories,
         feeds   => \%feeds,
-        status  => $self->format_status($empire, $body),
+        status  => $self->format_status($session, $body),
     };
 }
 
@@ -75,7 +75,7 @@ sub restrict_coverage {
     $body->restrict_coverage($onoff);
     $body->update;
     return {
-        status  => $self->format_status($empire, $body),
+        status  => $self->format_status($session, $body),
     };
 }
 
diff --git a/lib/Lacuna/RPC/Building/Observatory.pm b/lib/Lacuna/RPC/Building/Observatory.pm
index 59e51c23..d3e0e752 100644
--- a/lib/Lacuna/RPC/Building/Observatory.pm
+++ b/lib/Lacuna/RPC/Building/Observatory.pm
@@ -31,7 +31,7 @@ sub abandon_probe {
         $probe->delete;
     }
     $empire->clear_probed_stars;
-    return {status => $self->format_status($empire, $building->body)};
+    return {status => $self->format_status($session, $building->body)};
 }
 
 sub abandon_all_probes {
@@ -41,7 +41,7 @@ sub abandon_all_probes {
     my $building = $session->current_building;
     $building->probes->delete;
     $empire->clear_probed_stars;
-    return {status => $self->format_status($empire, $building->body)};
+    return {status => $self->format_status($session, $building->body)};
 }
 
 sub get_probed_stars {
@@ -59,7 +59,7 @@ sub get_probed_stars {
     return {
         stars       => \@stars,
         star_count  => $probes->pager->total_entries,
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         max_probes  => $building->max_probes,
         travelling  => $travelling,
     };
diff --git a/lib/Lacuna/RPC/Building/OracleOfAnid.pm b/lib/Lacuna/RPC/Building/OracleOfAnid.pm
index 17cf3d35..a80338a1 100644
--- a/lib/Lacuna/RPC/Building/OracleOfAnid.pm
+++ b/lib/Lacuna/RPC/Building/OracleOfAnid.pm
@@ -25,7 +25,7 @@ sub get_star {
     unless ($building->body->calculate_distance_to_target($star) < $building->range) {
         confess [1009, 'That star is too far away.'];
     }
-    return { star=>$star->get_status($empire, 1), status=>$self->format_status($empire, $building->body) };
+    return { star=>$star->get_status($empire, 1), status=>$self->format_status($session, $building->body) };
 }
 
 sub get_probed_stars {
@@ -50,7 +50,7 @@ sub get_probed_stars {
     return {
         stars           => \@stars,
         star_count      => $probes->pager->total_entries,
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
         max_distance    => $building->level * 10,
     };
 }
diff --git a/lib/Lacuna/RPC/Building/OreStorage.pm b/lib/Lacuna/RPC/Building/OreStorage.pm
index a7d34695..420a85fc 100644
--- a/lib/Lacuna/RPC/Building/OreStorage.pm
+++ b/lib/Lacuna/RPC/Building/OreStorage.pm
@@ -42,7 +42,7 @@ sub dump {
     $body->add_type('waste', $amount);
     $body->update;
     return {
-        status      => $self->format_status($empire, $body),
+        status      => $self->format_status($session, $body),
     };
 }
 
diff --git a/lib/Lacuna/RPC/Building/Parliament.pm b/lib/Lacuna/RPC/Building/Parliament.pm
index 17f1b728..e8d3e56c 100644
--- a/lib/Lacuna/RPC/Building/Parliament.pm
+++ b/lib/Lacuna/RPC/Building/Parliament.pm
@@ -46,7 +46,7 @@ sub get_stars_in_jurisdiction {
         push @out, $star->get_status;
     }
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
         stars           => \@out,
     };
 }
@@ -69,7 +69,7 @@ sub get_bodies_for_star_in_jurisdiction {
         push @out, $body->get_status($empire);
     }
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
         bodies          => \@out,
     };
 }
@@ -102,7 +102,7 @@ sub get_mining_platforms_for_asteroid_in_jurisdiction {
         };
     }
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
         platforms       => \@out,
     };
 }
@@ -121,7 +121,7 @@ sub view_laws {
             push @out, $law->get_status($empire);
         }
         return {
-            status          => $self->format_status($empire, $body),
+            status          => $self->format_status($session, $body),
             laws            => \@out,
         };
     }
@@ -178,7 +178,7 @@ sub propose_fire_bfg {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -214,7 +214,7 @@ sub propose_writ {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -257,7 +257,7 @@ sub propose_transfer_station_ownership {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -294,7 +294,7 @@ sub propose_repeal_law {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -341,7 +341,7 @@ sub propose_rename_star {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -375,7 +375,7 @@ sub propose_broadcast_on_network19 {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -423,7 +423,7 @@ sub propose_rename_asteroid {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -473,7 +473,7 @@ sub propose_rename_uninhabited {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -502,7 +502,7 @@ sub propose_members_only_mining_rights {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -531,7 +531,7 @@ sub propose_members_only_excavation {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -560,7 +560,7 @@ sub propose_members_only_colonization {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -590,7 +590,7 @@ sub propose_members_only_stations {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -619,7 +619,7 @@ sub propose_neutralize_bhg {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -653,7 +653,7 @@ sub allow_bhg_by_alliance {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -693,7 +693,7 @@ sub propose_evict_mining_platform {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -733,7 +733,7 @@ sub propose_evict_excavator {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -773,7 +773,7 @@ sub propose_elect_new_leader {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -820,7 +820,7 @@ sub propose_induct_member {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -863,7 +863,7 @@ sub propose_expel_member {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -897,7 +897,7 @@ sub propose_taxation {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -961,7 +961,7 @@ sub propose_foreign_aid {
     $proposition->proposed_by($empire);
     $proposition->insert;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         proposition => $proposition->get_status($empire),
     };
 }
@@ -977,7 +977,7 @@ sub view_taxes_collected {
         push @out, $tax->get_status();
     }
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
         taxes_collected    => \@out,
     };
 }
diff --git a/lib/Lacuna/RPC/Building/PlanetaryCommand.pm b/lib/Lacuna/RPC/Building/PlanetaryCommand.pm
index c71c3fc3..b2b9c156 100644
--- a/lib/Lacuna/RPC/Building/PlanetaryCommand.pm
+++ b/lib/Lacuna/RPC/Building/PlanetaryCommand.pm
@@ -55,7 +55,7 @@ sub view_plans {
         push @out, $item;
     }
     return {
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
         plans   => \@out,
     }
 }
diff --git a/lib/Lacuna/RPC/Building/PoliceStation.pm b/lib/Lacuna/RPC/Building/PoliceStation.pm
index 9d406e1f..2704c422 100644
--- a/lib/Lacuna/RPC/Building/PoliceStation.pm
+++ b/lib/Lacuna/RPC/Building/PoliceStation.pm
@@ -37,7 +37,7 @@ sub view_foreign_spies {
         };
     }
     return {
-        status                  => $self->format_status($empire, $building->body),
+        status                  => $self->format_status($session, $building->body),
         spies                   => \@out,
         spy_count               => $spies->pager->total_entries,
     };
@@ -65,7 +65,7 @@ sub execute_prisoner {
     );
     $prisoner->delete;
     return {
-        status                  => $self->format_status($empire, $body),
+        status                  => $self->format_status($session, $body),
     }
 }
 
@@ -91,7 +91,7 @@ sub release_prisoner {
         params      => [$empire->id, $empire->name, $body->x, $body->y, $body->name, $prisoner->name, $prisoner->from_body->id, $prisoner->from_body->name],
     );
     return {
-        status                  => $self->format_status($empire, $body),
+        status                  => $self->format_status($session, $body),
     }
 }
 
@@ -120,7 +120,7 @@ sub view_prisoners {
         };
     }
     return {
-        status                  => $self->format_status($empire, $building->body),
+        status                  => $self->format_status($session, $building->body),
         prisoners               => \@out,
         captured_count          => $spies->pager->total_entries,
     };
@@ -140,7 +140,7 @@ sub view_ships_travelling {
         push @travelling, $ship->get_status;
     }
     return {
-        status                      => $self->format_status($empire, $body),
+        status                      => $self->format_status($session, $body),
         number_of_ships_travelling  => $ships->pager->total_entries,
         ships_travelling            => \@travelling,
     };
@@ -190,7 +190,7 @@ sub view_foreign_ships {
         }
     }
     return {
-        status                      => $self->format_status($empire, $building->body),
+        status                      => $self->format_status($session, $building->body),
         number_of_ships             => $ships->pager->total_entries,
         ships                       => \@fleet,
     };
@@ -238,7 +238,7 @@ sub view_ships_orbiting {
             push @fleet, \%ship_info;
     }
     return {
-        status                      => $self->format_status($empire, $building->body),
+        status                      => $self->format_status($session, $building->body),
         number_of_ships             => $ships->pager->total_entries,
         ships                       => \@fleet,
     };
diff --git a/lib/Lacuna/RPC/Building/Security.pm b/lib/Lacuna/RPC/Building/Security.pm
index 2a8912a4..485a1660 100644
--- a/lib/Lacuna/RPC/Building/Security.pm
+++ b/lib/Lacuna/RPC/Building/Security.pm
@@ -37,7 +37,7 @@ sub view_foreign_spies {
         };
     }
     return {
-        status                  => $self->format_status($empire, $building->body),
+        status                  => $self->format_status($session, $building->body),
         spies                   => \@out,
         spy_count               => $spies->pager->total_entries,
     };
@@ -66,7 +66,7 @@ sub execute_prisoner {
     );
     $prisoner->delete;
     return {
-        status                  => $self->format_status($empire, $body),
+        status                  => $self->format_status($session, $body),
     }
 }
 
@@ -92,7 +92,7 @@ sub release_prisoner {
         params      => [$empire->id, $empire->name, $body->x, $body->y, $body->name, $prisoner->name, $prisoner->from_body->id, $prisoner->from_body->name],
     );
     return {
-        status                  => $self->format_status($empire, $body),
+        status                  => $self->format_status($session, $body),
     }
 }
 
@@ -121,7 +121,7 @@ sub view_prisoners {
         };
     }
     return {
-        status                  => $self->format_status($empire, $building->body),
+        status                  => $self->format_status($session, $building->body),
         prisoners               => \@out,
         captured_count          => $spies->pager->total_entries,
     };
diff --git a/lib/Lacuna/RPC/Building/Shipyard.pm b/lib/Lacuna/RPC/Building/Shipyard.pm
index e5283f8a..0a45cfd9 100644
--- a/lib/Lacuna/RPC/Building/Shipyard.pm
+++ b/lib/Lacuna/RPC/Building/Shipyard.pm
@@ -38,7 +38,7 @@ sub view_build_queue {
     }
     my $number_of_ships = $ships->pager->total_entries;
     return {
-        status                      => $self->format_status($empire, $body),
+        status                      => $self->format_status($session, $body),
         number_of_ships_building    => $number_of_ships,
         ships_building              => \@building,
         cost_to_subsidize           => $number_of_ships,
@@ -114,7 +114,7 @@ sub delete_build {
     }
 
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
         cancelled_count => $cancelled_count,
     };
 }
@@ -331,7 +331,7 @@ sub build_ships {
     #}
 
     #return $self->view_build_queue($session, $building_view);
-    Lacuna::RPC::Body->new->get_buildings($empire, $body);
+    Lacuna::RPC::Body->new->get_buildings($session, $body);
 }
 
 
@@ -379,7 +379,7 @@ sub get_buildable {
         docks_available => $docks,
         build_queue_max => $max_ships,
         build_queue_used => $total_ships_building,
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
         };
 }
 
diff --git a/lib/Lacuna/RPC/Building/SpacePort.pm b/lib/Lacuna/RPC/Building/SpacePort.pm
index fa76b894..390079df 100644
--- a/lib/Lacuna/RPC/Building/SpacePort.pm
+++ b/lib/Lacuna/RPC/Building/SpacePort.pm
@@ -94,7 +94,7 @@ sub get_fleet_for {
         push @$summary, $summation;
     }
     my %out = (
-        status  => $self->format_status($empire, $body),
+        status  => $self->format_status($session, $body),
         ships   => $summary,
     );
     return \%out;
@@ -156,7 +156,7 @@ sub get_ships_for {
     my $max_ships = Lacuna->config->get('ships_per_fleet') || 600;
 
     my %out = (
-        status              => $self->format_status($empire, $body),
+        status              => $self->format_status($session, $body),
         incoming            => \@incoming,
         available           => \@available,
         unavailable         => \@unavailable,
@@ -238,7 +238,7 @@ sub send_ship {
     $body->add_to_neutral_entry($ship->combat);
     return {
         ship    => $ship->get_status,
-        status  => $self->format_status($empire),
+        status  => $self->format_status($session),
     }
 }
 
@@ -549,7 +549,7 @@ sub send_fleet {
   }
   return {
       fleet  => \@ret,
-      status  => $self->format_status($empire),
+      status  => $self->format_status($session),
   };
 }
 
@@ -579,7 +579,7 @@ sub recall_ship {
     $ship->body->update;
     return {
         ship    => $ship->get_status,
-        status  => $self->format_status($empire),
+        status  => $self->format_status($session),
     }
 }
 
@@ -614,7 +614,7 @@ sub recall_all {
     }
     return {
     ships  => \@ret,
-        status  => $self->format_status($empire),
+        status  => $self->format_status($session),
     }
 }
 
@@ -688,7 +688,7 @@ sub prepare_send_spies {
     undef $spies;
 
     return {
-        status  => $self->format_status($empire),
+        status  => $self->format_status($session),
         ships   => \@ships,
         spies   => \@spies,
     };
@@ -775,7 +775,7 @@ sub send_spies {
         ship            => $ship->get_status,
         spies_sent      => \@ids_sent,
         spies_not_sent  => \@ids_not_sent,
-        status          => $self->format_status($empire, $on_body)
+        status          => $self->format_status($session, $on_body)
     };
 }
 
@@ -836,7 +836,7 @@ sub prepare_fetch_spies {
     undef $spies;
     
     return {
-        status  => $self->format_status($empire),
+        status  => $self->format_status($session),
         ships   => \@ships,
         spies   => \@spies,
     };
@@ -907,7 +907,7 @@ sub fetch_spies {
         ship    => $ship->get_status,
         spies_fetched      => \@ids_fetched,
         spies_not_fetched  => \@ids_not_fetched,
-        status  => $self->format_status($empire, $to_body),
+        status  => $self->format_status($session, $to_body),
     };
 }
 
@@ -927,7 +927,7 @@ sub view_ships_travelling {
         push @travelling, $ship->get_status;
     }
     return {
-        status                      => $self->format_status($empire, $body),
+        status                      => $self->format_status($session, $body),
         number_of_ships_travelling  => $ships->pager->total_entries,
         ships_travelling            => \@travelling,
     };
@@ -1049,7 +1049,7 @@ sub view_all_ships {
     }
 
     return {
-        status                      => $self->format_status($empire, $body),
+        status                      => $self->format_status($session, $body),
         number_of_ships             => defined $paging->{page_number} ? $ships->pager->total_entries : $ships->count,
         ships                       => \@fleet,
     };
@@ -1103,7 +1103,7 @@ sub view_foreign_ships {
         }
     }
     return {
-        status                      => $self->format_status($empire, $building->body),
+        status                      => $self->format_status($session, $building->body),
         number_of_ships             => $ships->pager->total_entries,
         ships                       => \@fleet,
     };
@@ -1153,7 +1153,7 @@ sub view_ships_orbiting {
             push @fleet, \%ship_info;
     }
     return {
-        status                      => $self->format_status($empire, $building->body),
+        status                      => $self->format_status($session, $building->body),
         number_of_ships             => $ships->pager->total_entries,
         ships                       => \@fleet,
     };
@@ -1204,7 +1204,7 @@ sub _view_ships {
         }
     }
     return {
-        status                      => $self->format_status($empire, $building->body),
+        status                      => $self->format_status($session, $building->body),
         number_of_ships             => $ships->pager->total_entries,
         ships                       => \@fleet,
     };
@@ -1230,7 +1230,7 @@ sub name_ship {
     $ship->name($name);
     $ship->update;
     return {
-        status                      => $self->format_status($empire, $building->body),
+        status                      => $self->format_status($session, $building->body),
     };
 }
 
@@ -1251,7 +1251,7 @@ sub scuttle_ship {
     }
     $ship->delete;
     return {
-        status                      => $self->format_status($empire, $building->body),
+        status                      => $self->format_status($session, $building->body),
     };    
 }
 
@@ -1274,7 +1274,7 @@ sub mass_scuttle_ship {
     )->delete;
 
     return {
-        status                      => $self->format_status($empire, $building->body),
+        status                      => $self->format_status($session, $building->body),
     };    
 }
 
@@ -1309,7 +1309,7 @@ sub view_battle_logs {
         };
     }
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
         number_of_logs  => $battle_logs->pager->total_entries,
         battle_log      => \@logs,
     };
diff --git a/lib/Lacuna/RPC/Building/StationCommand.pm b/lib/Lacuna/RPC/Building/StationCommand.pm
index 39cbde19..18cb263e 100644
--- a/lib/Lacuna/RPC/Building/StationCommand.pm
+++ b/lib/Lacuna/RPC/Building/StationCommand.pm
@@ -47,7 +47,7 @@ sub view_plans {
     }
 
     return {
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
         plans   => \@out,
     }
 }
diff --git a/lib/Lacuna/RPC/Building/SubspaceSupplyDepot.pm b/lib/Lacuna/RPC/Building/SubspaceSupplyDepot.pm
index 983f0512..9e04664f 100644
--- a/lib/Lacuna/RPC/Building/SubspaceSupplyDepot.pm
+++ b/lib/Lacuna/RPC/Building/SubspaceSupplyDepot.pm
@@ -20,7 +20,7 @@ sub transmit_food {
     my $building = $session->current_building;
     $building->transmit_food;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         building                    => {
             work        => {
                 seconds_remaining   => $building->work_seconds_remaining,
@@ -38,7 +38,7 @@ sub transmit_energy {
     my $building = $session->current_building;
     $building->transmit_energy;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         building                    => {
             work        => {
                 seconds_remaining   => $building->work_seconds_remaining,
@@ -56,7 +56,7 @@ sub transmit_ore {
     my $building = $session->current_building;
     $building->transmit_ore;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         building                    => {
             work        => {
                 seconds_remaining   => $building->work_seconds_remaining,
@@ -74,7 +74,7 @@ sub transmit_water {
     my $building = $session->current_building;
     $building->transmit_water;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         building                    => {
             work        => {
                 seconds_remaining   => $building->work_seconds_remaining,
@@ -92,7 +92,7 @@ sub complete_build_queue {
     my $building = $session->current_building;
     $building->complete_build_queue;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         building                    => {
             work        => {
                 seconds_remaining   => $building->work_seconds_remaining,
diff --git a/lib/Lacuna/RPC/Building/TempleOfTheDrajilites.pm b/lib/Lacuna/RPC/Building/TempleOfTheDrajilites.pm
index 9230f370..2d0c5cc8 100644
--- a/lib/Lacuna/RPC/Building/TempleOfTheDrajilites.pm
+++ b/lib/Lacuna/RPC/Building/TempleOfTheDrajilites.pm
@@ -41,7 +41,7 @@ sub view_planet {
         };
     }
     return {
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
         map     => {
             surface_image   => $planet->surface,
             buildings       => \@map
@@ -78,7 +78,7 @@ sub list_planets {
     }
     
     return {
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
         planets => \@planets,
     };
 }
diff --git a/lib/Lacuna/RPC/Building/Trade.pm b/lib/Lacuna/RPC/Building/Trade.pm
index e7e5aaa0..f93575aa 100644
--- a/lib/Lacuna/RPC/Building/Trade.pm
+++ b/lib/Lacuna/RPC/Building/Trade.pm
@@ -78,7 +78,7 @@ sub get_trade_ships {
         push @ships, $ship->get_status($target);
     }
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         ships       => \@ships,
     };
 }
@@ -114,7 +114,7 @@ sub add_supply_ship_to_fleet {
     }
     $building->add_supply_ship($ship);
     return {
-        status  =>$self->format_status($empire, $building->body),
+        status  =>$self->format_status($session, $building->body),
     };
 }
 
@@ -149,7 +149,7 @@ sub add_waste_ship_to_fleet {
     }
     $building->add_waste_ship($ship);
     return {
-        status  =>$self->format_status($empire, $building->body),
+        status  =>$self->format_status($session, $building->body),
     };
 }
 
@@ -182,7 +182,7 @@ sub remove_supply_ship_from_fleet {
         $ship->land->update;
     }
     return {
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
     };
 }
 
@@ -215,7 +215,7 @@ sub remove_waste_ship_from_fleet {
         $ship->land->update;
     }
     return {
-        status  => $self->format_status($empire, $building->body),
+        status  => $self->format_status($session, $building->body),
     };
 }
 
@@ -232,7 +232,7 @@ sub get_supply_ships {
         push @ships, $ship->get_status;
     }
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         ships       => \@ships,
     };
 }
@@ -251,7 +251,7 @@ sub get_waste_ships {
         push @ships, $ship->get_status($target);
     }
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         ships       => \@ships,
     };
 }
@@ -272,7 +272,7 @@ sub view_supply_chains {
         push @supply_chains, $chain->get_status;
     }
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
         supply_chains  => \@supply_chains,
         max_supply_chains => $max_chains,
     };
@@ -290,7 +290,7 @@ sub view_waste_chains {
         push @waste_chains, $waste_push->get_status;
     }
     return {
-        status          => $self->format_status($empire, $building->body),
+        status          => $self->format_status($session, $building->body),
         waste_chain     => \@waste_chains,
     };
 }
@@ -470,7 +470,7 @@ sub push_items {
     }
     my $ship = $building->push_items($target, $items, $options);
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
         ship        => $ship->get_status,
     };
 }
@@ -493,7 +493,7 @@ sub withdraw_from_market {
     }
     $trade->withdraw($building->body);
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
     };
 }
 
@@ -558,7 +558,7 @@ sub accept_from_market {
     $trade->delete;
 
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
     };
 }
 
@@ -578,7 +578,7 @@ sub add_to_market {
     my $trade = $building->add_to_market($offer, $ask, $options);
     return {
         trade_id    => $trade->id,
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
     };
 }
 
diff --git a/lib/Lacuna/RPC/Building/Transporter.pm b/lib/Lacuna/RPC/Building/Transporter.pm
index 58408e14..f3c43df4 100644
--- a/lib/Lacuna/RPC/Building/Transporter.pm
+++ b/lib/Lacuna/RPC/Building/Transporter.pm
@@ -110,7 +110,7 @@ sub push_items {
     });
     $empire->update; # has to go after due to validation in push_goods
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
     };
 }
 
@@ -138,7 +138,7 @@ sub add_to_market {
     $empire->update;
     return {
         trade_id    => $trade->id,
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
     };
 }
 
@@ -160,7 +160,7 @@ sub withdraw_from_market {
     }
     $trade->withdraw($building->body);
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
     };
 }
 
@@ -224,7 +224,7 @@ sub accept_from_market {
     $body->update;
     $trade->body->update;
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
     };
 }
 
@@ -237,7 +237,7 @@ sub trade_one_for_one {
     confess [1013, 'You cannot use a transporter that has not yet been built.'] unless $building->effective_level > 0;
     $building->trade_one_for_one($have, $want, $quantity);
     return {
-        status      => $self->format_status($empire, $building->body),
+        status      => $self->format_status($session, $building->body),
     };
 }
 
diff --git a/lib/Lacuna/RPC/Building/WaterStorage.pm b/lib/Lacuna/RPC/Building/WaterStorage.pm
index 18f53a0c..a9fe0eb4 100644
--- a/lib/Lacuna/RPC/Building/WaterStorage.pm
+++ b/lib/Lacuna/RPC/Building/WaterStorage.pm
@@ -25,7 +25,7 @@ sub dump {
     $body->add_type('waste', $amount);
     $body->update;
     return {
-        status      => $self->format_status($empire, $body),
+        status      => $self->format_status($session, $body),
         };
 }
 
diff --git a/lib/Lacuna/RPC/Chat.pm b/lib/Lacuna/RPC/Chat.pm
index 0da41d2a..c92c8154 100644
--- a/lib/Lacuna/RPC/Chat.pm
+++ b/lib/Lacuna/RPC/Chat.pm
@@ -100,7 +100,7 @@ sub init_chat {
         rating  => 'g',
 	);
     my $ret = {
-        status          => $self->format_status($empire),
+        status          => $self->format_status($session),
         gravatar_url    => $gravatar_url,
         chat_name       => $chat_name,
         chat_auth       => $chat_auth->create_token,
diff --git a/lib/Lacuna/RPC/Empire.pm b/lib/Lacuna/RPC/Empire.pm
index 6d7ff1f7..f00be1a5 100644
--- a/lib/Lacuna/RPC/Empire.pm
+++ b/lib/Lacuna/RPC/Empire.pm
@@ -32,7 +32,7 @@ sub find {
         $limit--;
         last unless $limit;
     }
-    return { empires => \@list_of_empires, status => $self->format_status($empire) };
+    return { empires => \@list_of_empires, status => $self->format_status($session) };
 }
 
 sub is_name_available {
@@ -142,9 +142,11 @@ sub login {
         )->create_token;
     }
 
+    my $session = $empire->start_session(\%session_params);
+
     return {
-        session_id  => $empire->start_session(\%session_params)->id,
-        status      => $self->format_status($empire),
+        session_id  => $session->id,
+        status      => $self->format_status($session),
     };
 
 }
@@ -174,7 +176,7 @@ sub benchmark {
     $out{validation} = Time::HiRes::tv_interval($t);
 
     $t = [Time::HiRes::gettimeofday];
-    $empire->start_session({ api_key => $api_key, request => $plack_request });
+    my $session = $empire->start_session({ api_key => $api_key, request => $plack_request });
     $out{session} = Time::HiRes::tv_interval($t);
 
     $t = [Time::HiRes::gettimeofday];
@@ -190,7 +192,7 @@ sub benchmark {
     $out{pcc} = Time::HiRes::tv_interval($t);
  
     $t = [Time::HiRes::gettimeofday];
-    $self->format_status($empire, $home);
+    $self->format_status($session, $home);
     $out{status} = Time::HiRes::tv_interval($t);
  
     return \%out;
@@ -231,7 +233,7 @@ sub change_password {
     
     $empire->password($empire->encrypt_password($password1));
     $empire->update;
-    return { status => $self->format_status($empire) };
+    return { status => $self->format_status($session) };
 }
 
 
@@ -289,7 +291,8 @@ sub reset_password {
     $empire->update;
     
     # authenticate
-    return { session_id => $empire->start_session({ api_key => $api_key, request => $plack_request })->id, status => $self->format_status($empire) };
+    my $session = $empire->start_session({ api_key => $api_key, request => $plack_request });
+    return { session_id => $session->id, status => $self->format_status($session) };
 }
 
 sub create {
@@ -399,9 +402,10 @@ sub found {
     $empire->attach_invite_code($invite_code);
     
     my $welcome = $empire->found;
+    my $session = $empire->start_session({ api_key => $api_key, request => $plack_request });
     return {
-        session_id          => $empire->start_session({ api_key => $api_key, request => $plack_request })->id,
-        status              => $self->format_status($empire),
+        session_id          => $session->id,
+        status              => $self->format_status($session),
         welcome_message_id  => $welcome->id,
     };
 }
@@ -460,7 +464,7 @@ sub view_profile {
         skip_incoming_ships     => $empire->skip_incoming_ships,
     );
 
-    return { profile => \%out, status => $self->format_status($empire) };    
+    return { profile => \%out, status => $self->format_status($session) };    
 }
 
 sub edit_profile {
@@ -677,7 +681,7 @@ sub set_status_message {
     my $empire   = $session->current_empire;
     $empire->status_message($message);
     $empire->update;
-    return $self->format_status($empire);
+    return $self->format_status($session);
 }
 
 sub view_public_profile {
@@ -739,7 +743,7 @@ sub view_public_profile {
     }
     $out{known_colonies} = \@colonies;
 
-    return { profile => \%out, status => $self->format_status($viewer_empire) };
+    return { profile => \%out, status => $self->format_status($session) };
 }
 
 sub boost_ore {
@@ -805,7 +809,7 @@ sub boost {
     $empire->$type($start);
     $empire->update;
     return {
-        status => $self->format_status($empire),
+        status => $self->format_status($session),
         $type => format_date($empire->$type),
     };
 }
@@ -815,7 +819,7 @@ sub view_boosts {
     my $session  = $self->get_session({session_id => $session_id});
     my $empire   = $session->current_empire;
     return {
-        status  => $self->format_status($empire),
+        status  => $self->format_status($session),
         boosts  => {
             food         => format_date($empire->food_boost),
             happiness    => format_date($empire->happiness_boost),
@@ -837,7 +841,7 @@ sub enable_self_destruct {
         confess [1015, 'Sitters cannot enable or disable self destruct.'];
     }
     $empire->enable_self_destruct;
-    return { status => $self->format_status($empire) };
+    return { status => $self->format_status($session) };
 }
 
 sub disable_self_destruct {
@@ -848,7 +852,7 @@ sub disable_self_destruct {
         confess [1015, 'Sitters cannot enable or disable self destruct.'];
     }
     $empire->disable_self_destruct;
-    return { status => $self->format_status($empire) };
+    return { status => $self->format_status($session) };
 }
 
 sub redeem_essentia_code {
@@ -856,7 +860,7 @@ sub redeem_essentia_code {
     my $session  = $self->get_session({session_id => $session_id});
     my $empire   = $session->current_empire;
     my $amount = $empire->redeem_essentia_code($code);
-    return { amount => $amount, status => $self->format_status($empire) };
+    return { amount => $amount, status => $self->format_status($session) };
 }
 
 sub get_invite_friend_url {
@@ -865,7 +869,7 @@ sub get_invite_friend_url {
     my $empire   = $session->current_empire;
     return {
         referral_url    => $empire->get_invite_friend_url,
-        status          => $self->format_status($empire),
+        status          => $self->format_status($session),
     };
 }
 
@@ -897,7 +901,7 @@ sub invite_friend {
     else {
         confess [1009, 'Could not read the address(es) entered. Perhaps you formatted something incorrectly?', $addresses];
     }
-    return { status => $self->format_status($empire), sent => \@sent, not_sent => \@not_sent };
+    return { status => $self->format_status($session), sent => \@sent, not_sent => \@not_sent };
 }
 
 sub vet_species {
@@ -950,7 +954,7 @@ sub redefine_species_limits {
     my $session  = $self->get_session({session_id => $session_id});
     my $empire   = $session->current_empire;
     my $out = $empire->determine_species_limits($empire);
-    $out->{status} = $self->format_status($empire);
+    $out->{status} = $self->format_status($session);
     return $out;
 }
 
@@ -988,7 +992,7 @@ sub redefine_species {
     $empire->planets->update({needs_recalc=>1});
     
     return {
-        status  => $self->format_status($empire),
+        status  => $self->format_status($session),
     };
 }
 
diff --git a/lib/Lacuna/RPC/Firebase.pm b/lib/Lacuna/RPC/Firebase.pm
index d2a19ccc..e3bb5549 100644
--- a/lib/Lacuna/RPC/Firebase.pm
+++ b/lib/Lacuna/RPC/Firebase.pm
@@ -13,7 +13,7 @@ sub get_token {
     my $empire   = $session->current_empire;
     my $firebase_secret = Lacuna->config->get('firebase/secret');
     unless ($firebase_secret) {
-        return { token => '', status => $self->format_status($empire)};
+        return { token => '', status => $self->format_status($session)};
     }
     my $token_generator = WWW::Firebase::TokenGenerator->new({
         secret  => $firebase_secret,
@@ -28,7 +28,7 @@ sub get_token {
         alliance_name   => $empire->alliance_id ? $empire->alliance->name : '',
     });
 
-    return { token => $token, status => $self->format_status($empire)};
+    return { token => $token, status => $self->format_status($session)};
 }
 
 __PACKAGE__->register_rpc_method_names(
diff --git a/lib/Lacuna/RPC/Map.pm b/lib/Lacuna/RPC/Map.pm
index ad3eb93b..16e44373 100644
--- a/lib/Lacuna/RPC/Map.pm
+++ b/lib/Lacuna/RPC/Map.pm
@@ -19,7 +19,7 @@ sub check_star_for_incoming_probe {
         $date = $incoming->date_available_formatted;
     }
     return {
-        status  => $self->format_status($empire),
+        status  => $self->format_status($session),
         incoming_probe  => $date,
     };
 }
@@ -58,7 +58,7 @@ sub get_star_map {
     my $alliance_id = $empire->alliance_id || 0;
 
     my $out = Lacuna->db->resultset('Map::StarLite')->get_star_map( $alliance_id, $empire->id, $args->{left}, $args->{right}, $args->{bottom}, $args->{top} );
-    $out->{status} = $self->format_status($empire);
+    $out->{status} = $self->format_status($session);
 
     return $out;
 }
@@ -78,7 +78,7 @@ sub get_stars {
     while (my $star = $stars->next) {
         push @out, $star->get_status($empire);
     }
-    return { stars=>\@out, status=>$self->format_status($empire) };
+    return { stars=>\@out, status=>$self->format_status($session) };
 }
 
 sub get_star {
@@ -89,7 +89,7 @@ sub get_star {
     unless (defined $star) {
         confess [1002, "Couldn't find a star."];
     }
-    return { star=>$star->get_status($empire), status=>$self->format_status($empire) };
+    return { star=>$star->get_status($empire), status=>$self->format_status($session) };
 }
 
 sub get_star_by_name {
@@ -100,7 +100,7 @@ sub get_star_by_name {
     unless (defined $star) {
         confess [1002, "Couldn't find a star."];
     }
-    return { star=>$star->get_status($empire), status=>$self->format_status($empire) };
+    return { star=>$star->get_status($empire), status=>$self->format_status($session) };
 }
 
 sub get_star_by_xy {
@@ -111,7 +111,7 @@ sub get_star_by_xy {
     unless (defined $star) {
         confess [1002, "Couldn't find a star."];
     }
-    return { star=>$star->get_status($empire), status=>$self->format_status($empire) };
+    return { star=>$star->get_status($empire), status=>$self->format_status($session) };
 }
 
 sub search_stars {
@@ -126,7 +126,7 @@ sub search_stars {
     while (my $star = $stars->next) {
         push @out, $star->get_status; # planet data left out on purpose
     }
-    return { stars => \@out , status => $self->format_status($empire) };
+    return { stars => \@out , status => $self->format_status($session) };
 }
 
 sub probe_summary_fissures {
@@ -183,7 +183,7 @@ sub view_laws {
         }
         return {
             star            => $star->get_status($empire),
-            status          => $self->format_status($empire, $station),
+            status          => $self->format_status($session, $station),
             laws            => \@out,
         };
     }
@@ -192,7 +192,7 @@ sub view_laws {
         if ($star) {
             $output->{star} = $star->get_status($empire);
         }
-        $output->{status} = $self->format_status($empire);
+        $output->{status} = $self->format_status($session);
         $output->{laws} = [ { name => "Not controlled by a station",
                               descripition => "Not controlled by a station",
                               date_enacted => "00 00 0000 00:00:00 +0000",
diff --git a/lib/Lacuna/RPC/Stats.pm b/lib/Lacuna/RPC/Stats.pm
index c6831632..2d1518e8 100644
--- a/lib/Lacuna/RPC/Stats.pm
+++ b/lib/Lacuna/RPC/Stats.pm
@@ -66,7 +66,7 @@ sub alliance_rank {
         };
     }
     return {
-        status  => $self->format_status($empire),
+        status  => $self->format_status($session),
         alliances => \@alliances,
         total_alliances => $ranks->pager->total_entries,
         page_number => $page_number,
@@ -98,7 +98,7 @@ sub find_alliance_rank {
         };
     }
     return {
-        status  => $self->format_status($empire),
+        status  => $self->format_status($session),
         alliances => \@alliances,
     };
 }
@@ -142,7 +142,7 @@ sub empire_rank {
         };
     }
     return {
-        status  => $self->format_status($empire),
+        status  => $self->format_status($session),
         empires => \@empires,
         total_empires => $ranks->pager->total_entries,
         page_number => $page_number,
@@ -174,7 +174,7 @@ sub find_empire_rank {
         };
     }
     return {
-        status  => $self->format_status($empire),
+        status  => $self->format_status($session),
         empires => \@empires,
     };
 }
@@ -201,7 +201,7 @@ sub colony_rank {
         }
     }
     return {
-        status      => $self->format_status($empire),
+        status      => $self->format_status($session),
         colonies    => \@colonies,
     };
 }
@@ -231,7 +231,7 @@ sub spy_rank {
         }
     }
     return {
-        status      => $self->format_status($empire),
+        status      => $self->format_status($session),
         spies       => \@spies,
     };
 }
@@ -252,7 +252,7 @@ sub weekly_medal_winners {
         }
     }
     return {
-        status      => $self->format_status($empire),
+        status      => $self->format_status($session),
         winners       => \@winners,
     };
 }