diff --git a/blackjack.rb b/blackjack.rb
index b6dcda9..1ff2ec9 100644
--- a/blackjack.rb
+++ b/blackjack.rb
@@ -14,7 +14,7 @@ def value
   end
 
   def to_s
-    "#{@value}-#{suit}"
+    "#{@value}#{suit.to_s.chars.first.upcase}"
   end
 
 end
@@ -75,6 +75,13 @@ def initialize
 
   def hit
     @player_hand.hit!(@deck)
+    if @player_hand.value > 21
+      puts "Player busted!"
+      stand
+      end_status
+    else
+      pre_status
+    end
   end
 
   def stand
@@ -82,8 +89,14 @@ def stand
     @winner = determine_winner(@player_hand.value, @dealer_hand.value)
   end
 
-  def status
-    {:player_cards=> @player_hand.cards, 
+  def pre_status
+     { :player_cards => @player_hand.cards, 
+       :player_value => @player_hand.value,
+       :dealer_cards => @dealer_hand.cards[0] }
+  end
+    
+  def end_status
+    {:player_cards => @player_hand.cards, 
      :player_value => @player_hand.value,
      :dealer_cards => @dealer_hand.cards,
      :dealer_value => @dealer_hand.value,
@@ -103,7 +116,7 @@ def determine_winner(player_value, dealer_value)
   end
 
   def inspect
-    status
+    pre_status
   end
 end
 
@@ -135,7 +148,7 @@ def inspect
 
   it "should be formatted nicely" do
     card = Card.new(:diamonds, "A")
-    card.to_s.should eq("A-diamonds")
+    card.to_s.should eq("AD")
   end
 end