diff --git a/beer_song.rb b/beer_song.rb
new file mode 100644
index 0000000..da764f2
--- /dev/null
+++ b/beer_song.rb
@@ -0,0 +1,69 @@
+class BeerSong
+
+  def lyrics
+    verses(99, 0)
+  end
+
+  def verses(start, stop)
+    start.downto(stop)
+      .map { |number| verse(number) }
+      .join("\n")
+  end
+
+  def verse(number)
+    verse = Verse.new(number)
+    LINES.map { |line| line % verse }.map(&:capitalize).join
+  end
+
+  private
+
+  LINES = [
+    "%{bottle} of beer on the wall, %{bottle} of beer.\n".freeze,
+    "%{action}, %{bottle_left} of beer on the wall.\n".freeze,
+  ].freeze
+
+end
+
+Verse = Struct.new(:number) do
+  def to_hash
+    @hash ||=
+      case number
+      when 0 then defaults.merge(bottle_0)
+      when 1 then defaults.merge(bottle_1)
+      when 2 then defaults.merge(bottle_2)
+      else defaults
+      end
+  end
+
+  private
+
+  def defaults
+    {
+      bottle: "#{number} bottles",
+      bottle_left: "#{number - 1} bottles",
+      action: "Take one down and pass it around",
+    }
+  end
+
+  def bottle_0
+    {
+      bottle: "no more bottles",
+      bottle_left: "99 bottles",
+      action: "Go to the store and buy some more",
+    }
+  end
+
+  def bottle_1
+    {
+      bottle: "1 bottle",
+      bottle_left: "no more bottles",
+      action: "Take it down and pass it around",
+    }
+  end
+
+  def bottle_2
+    {
+      bottle_left: "1 bottle",
+    }
+  end
+end
diff --git a/beer_song_test.rb b/beer_song_test.rb
index 11c51c6..56de8eb 100755
--- a/beer_song_test.rb
+++ b/beer_song_test.rb
@@ -12,35 +12,30 @@ def test_the_first_verse
   end
 
   def test_another_verse
-    skip
     expected = "3 bottles of beer on the wall, 3 bottles of beer.\n" \
       "Take one down and pass it around, 2 bottles of beer on the wall.\n"
     assert_equal expected, BeerSong.new.verse(3)
   end
 
   def test_verse_2
-    skip
     expected = "2 bottles of beer on the wall, 2 bottles of beer.\n" \
       "Take one down and pass it around, 1 bottle of beer on the wall.\n"
     assert_equal expected, BeerSong.new.verse(2)
   end
 
   def test_verse_1
-    skip
     expected = "1 bottle of beer on the wall, 1 bottle of beer.\n" \
       "Take it down and pass it around, no more bottles of beer on the wall.\n"
     assert_equal expected, BeerSong.new.verse(1)
   end
 
   def test_verse_0
-    skip
     expected = "No more bottles of beer on the wall, no more bottles of beer.\n" \
       "Go to the store and buy some more, 99 bottles of beer on the wall.\n"
     assert_equal expected, BeerSong.new.verse(0)
   end
 
   def test_a_couple_verses
-    skip
     expected = "99 bottles of beer on the wall, 99 bottles of beer.\n" \
       "Take one down and pass it around, 98 bottles of beer on the wall.\n" \
       "\n" \
@@ -50,7 +45,6 @@ def test_a_couple_verses
   end
 
   def test_a_few_verses
-    skip
     expected = "2 bottles of beer on the wall, 2 bottles of beer.\n" \
       "Take one down and pass it around, 1 bottle of beer on the wall.\n" \
       "\n" \
@@ -63,7 +57,6 @@ def test_a_few_verses
   end
 
   def test_the_whole_song # rubocop:disable Metrics/MethodLength
-    skip
     expected = <<-SONG
 99 bottles of beer on the wall, 99 bottles of beer.
 Take one down and pass it around, 98 bottles of beer on the wall.
@@ -367,15 +360,4 @@ def test_the_whole_song # rubocop:disable Metrics/MethodLength
     SONG
     assert_equal expected, BeerSong.new.lyrics
   end
-
-  # Problems in exercism evolve over time,
-  # as we find better ways to ask questions.
-  # The version number refers to the version of the problem you solved,
-  # not your solution.
-  #
-  # Define a constant named VERSION inside of BookKeeping.
-  def test_bookkeeping
-    skip
-    assert_equal 2, BookKeeping::VERSION
-  end
 end