diff --git a/blackjack.rb b/blackjack.rb
index b6dcda9..4170b3e 100644
--- a/blackjack.rb
+++ b/blackjack.rb
@@ -1,4 +1,3 @@
-require 'rspec'
 class Card
 
   attr_reader :suit, :value
@@ -13,8 +12,12 @@ def value
     return @value
   end
 
+  def suit
+    @suit[0].capitalize
+  end
+
   def to_s
-    "#{@value}-#{suit}"
+    "#{@value}#{suit}"
   end
 
 end
@@ -55,6 +58,14 @@ def value
     cards.inject(0) {|sum, card| sum += card.value }
   end
 
+  def hidden_cards
+    "[XX, #{@cards.last}]"
+  end
+
+  def hidden_value
+    "#{@cards.last.value} + ?"
+  end
+
   def play_as_dealer(deck)
     if value < 16
       hit!(deck)
@@ -66,6 +77,7 @@ def play_as_dealer(deck)
 class Game
   attr_reader :player_hand, :dealer_hand
   def initialize
+    @player_is_standing = false
     @deck = Deck.new
     @player_hand = Hand.new
     @dealer_hand = Hand.new
@@ -75,19 +87,33 @@ def initialize
 
   def hit
     @player_hand.hit!(@deck)
+
+    if @player_hand.value > 21
+      stand
+    end
   end
 
   def stand
+    @player_is_standing = true
+
     @dealer_hand.play_as_dealer(@deck)
     @winner = determine_winner(@player_hand.value, @dealer_hand.value)
   end
 
   def status
-    {:player_cards=> @player_hand.cards, 
-     :player_value => @player_hand.value,
-     :dealer_cards => @dealer_hand.cards,
-     :dealer_value => @dealer_hand.value,
-     :winner => @winner}
+    if @player_is_standing
+      {:player_cards=> @player_hand.cards, 
+      :player_value => @player_hand.value,
+      :dealer_cards => @dealer_hand.cards,
+      :dealer_value => @dealer_hand.value,
+      :winner => @winner}
+    else
+      {:player_cards=> @player_hand.cards, 
+      :player_value => @player_hand.value,
+      :dealer_cards => @dealer_hand.hidden_cards,
+      :dealer_value => @dealer_hand.hidden_value,
+      :winner => @winner}
+    end
   end
 
   def determine_winner(player_value, dealer_value)
@@ -108,135 +134,3 @@ def inspect
 end
 
 
-describe Card do
-
-  it "should accept suit and value when building" do
-    card = Card.new(:clubs, 10)
-    card.suit.should eq(:clubs)
-    card.value.should eq(10)
-  end
-
-  it "should have a value of 10 for facecards" do
-    facecards = ["J", "Q", "K"]
-    facecards.each do |facecard|
-      card = Card.new(:hearts, facecard)
-      card.value.should eq(10)
-    end
-  end
-  it "should have a value of 4 for the 4-clubs" do
-    card = Card.new(:clubs, 4)
-    card.value.should eq(4)
-  end
-
-  it "should return 11 for Ace" do
-    card = Card.new(:diamonds, "A")
-    card.value.should eq(11)
-  end
-
-  it "should be formatted nicely" do
-    card = Card.new(:diamonds, "A")
-    card.to_s.should eq("A-diamonds")
-  end
-end
-
-
-describe Deck do
-
-  it "should build 52 cards" do
-    Deck.build_cards.length.should eq(52)
-  end
-
-  it "should have 52 cards when new deck" do
-    Deck.new.cards.length.should eq(52)
-  end
-
-end
-
-
-describe Hand do
-
-  it "should calculate the value correctly" do
-    deck = mock(:deck, :cards => [Card.new(:clubs, 4), Card.new(:diamonds, 10)])
-    hand = Hand.new
-    2.times { hand.hit!(deck) }
-    hand.value.should eq(14)
-  end
-
-  it "should take from the top of the deck" do
-    club4 = Card.new(:clubs, 4)
-    diamond7 = Card.new(:diamonds, 7) 
-    clubK = Card.new(:clubs, "K")
-
-    deck = mock(:deck, :cards => [club4, diamond7, clubK])
-    hand = Hand.new
-    2.times { hand.hit!(deck) }
-    hand.cards.should eq([club4, diamond7])
-
-  end
-
-  describe "#play_as_dealer" do
-    it "should hit blow 16" do
-      deck = mock(:deck, :cards => [Card.new(:clubs, 4), Card.new(:diamonds, 4), Card.new(:clubs, 2), Card.new(:hearts, 6)])
-      hand = Hand.new
-      2.times { hand.hit!(deck) }
-      hand.play_as_dealer(deck)
-      hand.value.should eq(16)
-    end
-    it "should not hit above" do
-      deck = mock(:deck, :cards => [Card.new(:clubs, 8), Card.new(:diamonds, 9)])
-      hand = Hand.new
-      2.times { hand.hit!(deck) }
-      hand.play_as_dealer(deck)
-      hand.value.should eq(17)
-    end
-    it "should stop on 21" do
-      deck = mock(:deck, :cards => [Card.new(:clubs, 4), 
-                                    Card.new(:diamonds, 7), 
-                                    Card.new(:clubs, "K")])
-      hand = Hand.new
-      2.times { hand.hit!(deck) }
-      hand.play_as_dealer(deck)
-      hand.value.should eq(21)
-    end
-  end
-end
-
-
-describe Game do
-
-  it "should have a players hand" do
-    Game.new.player_hand.cards.length.should eq(2)
-  end
-  it "should have a dealers hand" do
-    Game.new.dealer_hand.cards.length.should eq(2)
-  end
-  it "should have a status" do
-    Game.new.status.should_not be_nil
-  end
-  it "should hit when I tell it to" do
-    game = Game.new
-    game.hit
-    game.player_hand.cards.length.should eq(3)
-  end
-
-  it "should play the dealer hand when I stand" do
-    game = Game.new
-    game.stand
-    game.status[:winner].should_not be_nil
-  end
-
-  describe "#determine_winner" do
-    it "should have dealer win when player busts" do
-      Game.new.determine_winner(22, 15).should eq(:dealer) 
-    end
-    it "should player win if dealer busts" do
-      Game.new.determine_winner(18, 22).should eq(:player) 
-    end
-    it "should have player win if player > dealer" do
-      Game.new.determine_winner(18, 16).should eq(:player) 
-    end
-    it "should have push if tie" do
-      Game.new.determine_winner(16, 16).should eq(:push) 
-    end
-  end
-end
diff --git a/blackjack_spec.rb b/blackjack_spec.rb
new file mode 100644
index 0000000..63c4ed5
--- /dev/null
+++ b/blackjack_spec.rb
@@ -0,0 +1,202 @@
+require 'rspec'
+require './blackjack.rb'
+
+describe Card do
+
+  it "should accept suit and value when building" do
+    card = Card.new(:clubs, 10)
+    card.suit.should eq("C")
+    card.value.should eq(10)
+  end
+
+  it "should have a value of 10 for facecards" do
+    facecards = ["J", "Q", "K"]
+    facecards.each do |facecard|
+      card = Card.new(:hearts, facecard)
+      card.value.should eq(10)
+    end
+  end
+  it "should have a value of 4 for the 4-clubs" do
+    card = Card.new(:clubs, 4)
+    card.value.should eq(4)
+  end
+
+  it "should return 11 for Ace" do
+    card = Card.new(:diamonds, "A")
+    card.value.should eq(11)
+  end
+
+  it "should be formatted nicely" do
+    card = Card.new(:diamonds, "A")
+    card.to_s.should eq("AD")
+  end
+end
+
+
+describe Deck do
+
+  it "should build 52 cards" do
+    Deck.build_cards.length.should eq(52)
+  end
+
+  it "should have 52 cards when new deck" do
+    Deck.new.cards.length.should eq(52)
+  end
+
+end
+
+
+describe Hand do
+
+  it "should calculate the value correctly" do
+    deck = mock(:deck, :cards => [Card.new(:clubs, 4), Card.new(:diamonds, 10)])
+    hand = Hand.new
+    2.times { hand.hit!(deck) }
+    hand.value.should eq(14)
+  end
+
+  it "should take from the top of the deck" do
+    club4 = Card.new(:clubs, 4)
+    diamond7 = Card.new(:diamonds, 7) 
+    clubK = Card.new(:clubs, "K")
+
+    deck = mock(:deck, :cards => [club4, diamond7, clubK])
+    hand = Hand.new
+    2.times { hand.hit!(deck) }
+    hand.cards.should eq([club4, diamond7])
+  end
+
+  it "should not show value of cards if hidden" do
+    club4 = Card.new(:clubs, 4)
+    diamond7 = Card.new(:diamonds, 7) 
+    
+    deck = mock(:deck, :cards => [club4, diamond7])
+    hand = Hand.new
+    
+    2.times { hand.hit!(deck) }
+
+    hand.hidden_cards.should eq("[XX, 7D]")
+    hand.hidden_value.should eq("7 + ?")
+  end
+
+  describe "#play_as_dealer" do
+    it "should hit blow 16" do
+      deck = mock(:deck, :cards => [Card.new(:clubs, 4), Card.new(:diamonds, 4), Card.new(:clubs, 2), Card.new(:hearts, 6)])
+      hand = Hand.new
+      2.times { hand.hit!(deck) }
+      hand.play_as_dealer(deck)
+      hand.value.should eq(16)
+    end
+    it "should not hit above" do
+      deck = mock(:deck, :cards => [Card.new(:clubs, 8), Card.new(:diamonds, 9)])
+      hand = Hand.new
+      2.times { hand.hit!(deck) }
+      hand.play_as_dealer(deck)
+      hand.value.should eq(17)
+    end
+    it "should stop on 21" do
+      deck = mock(:deck, :cards => [Card.new(:clubs, 4), 
+                                    Card.new(:diamonds, 7), 
+                                    Card.new(:clubs, "K")])
+      hand = Hand.new
+      2.times { hand.hit!(deck) }
+      hand.play_as_dealer(deck)
+      hand.value.should eq(21)
+    end
+  end
+end
+
+
+describe Game do
+
+  it "should have a players hand" do
+    Game.new.player_hand.cards.length.should eq(2)
+  end
+  it "should have a dealers hand" do
+    Game.new.dealer_hand.cards.length.should eq(2)
+  end
+  it "should have a status" do
+    Game.new.status.should_not be_nil
+  end
+  it "should hit when I tell it to" do
+    game = Game.new
+    game.hit
+    game.player_hand.cards.length.should eq(3)
+  end
+
+  it "should play the dealer hand when I stand" do
+    game = Game.new
+    game.stand
+    game.status[:winner].should_not be_nil
+  end
+
+  it "should #standfor the player when she busts" do
+    game = Game.new
+
+    mock_deck = mock(:deck, :cards => [Card.new(:clubs, 7), 
+                                       Card.new(:diamonds, 7), 
+                                       Card.new(:clubs, "K"),
+                                       Card.new(:spades, "K"),
+                                       Card.new(:spades, 8)])
+
+
+    busting_player_hand = Hand.new
+    winning_dealer_hand = Hand.new
+
+    2.times { busting_player_hand.hit!(mock_deck) }
+    2.times { winning_dealer_hand.hit!(mock_deck) }
+
+    game.instance_variable_set(:@deck, mock_deck)
+    game.instance_variable_set(:@player_hand, busting_player_hand)
+    game.instance_variable_set(:@dealer_hand, winning_dealer_hand)
+
+    game.hit
+
+    game.status[:winner].should be(:dealer)
+  end
+
+  it "should not show the dealer hand until player has stood" do
+    game = Game.new
+
+    mock_deck = mock(:deck, :cards => [Card.new(:clubs, 7), 
+                                       Card.new(:diamonds, 7), 
+                                       Card.new(:clubs, "K"),
+                                       Card.new(:spades, "K"),
+                                       Card.new(:spades, 8)])
+
+
+    busting_player_hand = Hand.new
+    winning_dealer_hand = Hand.new
+
+    2.times { busting_player_hand.hit!(mock_deck) }
+    2.times { winning_dealer_hand.hit!(mock_deck) }
+
+    game.instance_variable_set(:@deck, mock_deck)
+    game.instance_variable_set(:@player_hand, busting_player_hand)
+    game.instance_variable_set(:@dealer_hand, winning_dealer_hand)
+
+
+    game.status[:dealer_cards].should eq("[XX, KS]")
+    game.status[:dealer_value].should eq("10 + ?")
+
+    game.stand
+
+    game.status[:dealer_cards].should eq(winning_dealer_hand.cards)
+    game.status[:dealer_value].should eq(winning_dealer_hand.value)
+  end
+
+  describe "#determine_winner" do
+    it "should have dealer win when player busts" do
+      Game.new.determine_winner(22, 15).should eq(:dealer) 
+    end
+    it "should player win if dealer busts" do
+      Game.new.determine_winner(18, 22).should eq(:player) 
+    end
+    it "should have player win if player > dealer" do
+      Game.new.determine_winner(18, 16).should eq(:player) 
+    end
+    it "should have push if tie" do
+      Game.new.determine_winner(16, 16).should eq(:push) 
+    end
+  end
+end