diff --git a/leap_test.rb b/leap_test.rb
index 6930f32..ccd6cb4 100755
--- a/leap_test.rb
+++ b/leap_test.rb
@@ -1,73 +1,22 @@
-#!/usr/bin/env ruby
-gem 'minitest', '>= 5.0.0'
-require 'minitest/autorun'
-require_relative 'leap'
-
-# Test data version:
-# deb225e Implement canonical dataset for scrabble-score problem (#255)
-
-class Date
-  def leap?
-    throw "Implement this yourself instead of using Ruby's implementation."
-  end
-
-  alias gregorian_leap? leap?
-  alias julian_leap? leap?
-end
-
-class YearTest < Minitest::Test
-  def test_leap_year
-    assert Year.leap?(1996), ''
-  end
-
-  def test_standard_and_odd_year
-    skip
-    refute Year.leap?(1997), ''
-  end
 
-  def test_standard_even_year
-    skip
-    refute Year.leap?(1998), ''
-  end
+require 'minitest/autorun'
+require_relative 'year'
 
-  def test_standard_nineteenth_century
-    skip
-    refute Year.leap?(1900), ''
+class YearTest < MiniTest::Unit::TestCase
+  def test_vanilla_leap_year
+    assert Year.new(1996).leap?
   end
 
-  def test_standard_eighteenth_century
-    skip
-    refute Year.leap?(1800), ''
+  def test_any_old_year
+    assert !Year.new(1997).leap?
   end
 
-  def test_leap_twenty_fourth_century
-    skip
-    assert Year.leap?(2400), ''
+  def test_century
+    assert !Year.new(1900).leap?
   end
 
-  def test_leap_y2k
-    skip
-    assert Year.leap?(2000), ''
+  def test_exceptional_century
+    assert Year.new(2000).leap?
   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 the top level BookKeeping
-  # module.
-  #  In your file, it will look like this:
-  #
-  # module BookKeeping
-  #   VERSION = 1 # Where the version number matches the one in the test.
-  # end
-  #
-  # If you are curious, read more about constants on RubyDoc:
-  # http://ruby-doc.org/docs/ruby-doc-bundle/UsersGuide/rg/constants.html
-
-  def test_bookkeeping
-    skip
-    assert_equal 2, BookKeeping::VERSION
-  end
 end
diff --git a/year.rb b/year.rb
new file mode 100644
index 0000000..487f7db
--- /dev/null
+++ b/year.rb
@@ -0,0 +1,19 @@
+class Year
+
+  def initialize(value)
+    @value = value
+  end
+
+  def leap?
+    divisble_by?(4) and (!divisble_by?(100) or divisble_by?(400))
+  end
+
+  private
+
+    attr_reader :value
+
+    def divisble_by?(divisor)
+      (value % divisor) == 0
+    end
+
+end