diff --git a/assignments/final_project.rb b/assignments/final_project.rb
index a621230..2e9ea5b 100644
--- a/assignments/final_project.rb
+++ b/assignments/final_project.rb
@@ -1,75 +1,85 @@
-# ========================================================================================
-#  Final Project: Game of Life
-# ========================================================================================
-
-#  The Game of Life is a simplified model of evolution and natural selection
-#  invented by the mathematician James Conway.
-
-#  http://en.wikipedia.org/wiki/Conway's_Game_of_Life
-
-
-#  ---------------------------------------------------------------------------------------
-#  Rules
-
-#  You have a grid of cells in 2 dimensions.
-
-#  Each cell has 8 neighbors:
-#  - top, right, bottom, left
-#  - top-left, top-right, bottom-right, bottom-left
-
-#  Each cell has 2 possible states: alive or dead.
-
-#  if a cell is alive and
-#  - has fewer than 2 live neighbors, it dies 
-#  - has more than 3 live neighbors, it dies
-#  - has 2 or 3 live neighbors, it lives to next generation
-
-#  if cell is dead and
-#  - has exactly 3 live neighbors, it becomes a live cell
-
-#  edges of board:
-#  - pretend the board is folded onto itself
-#  - the edges touch each other
-
-
-#  ---------------------------------------------------------------------------------------
-#  Tests
-
-#  You must have MiniTest unit tests for your class to validate your implementation.
-#  You might need to add methods or change the method signatures to enable testing.
-
-
-#  ---------------------------------------------------------------------------------------
-#  Rendering
-
-#  You choose how you want to render the current state of the board.
-#  ASCII? HTML? Something else?
-
-
-#  ---------------------------------------------------------------------------------------
-#  Bonus: DSL
-
-#  - Create a DSL that represents a state of the game.
-#  - Your render method can then be formatted as the DSL, so that you can round-trip
-#    between the textual DSL representation and the running instance.
-
-
-#  ---------------------------------------------------------------------------------------
-#  Suggested Implementation
-
-module FinalProject
-  class GameOfLife
-    def initialize(size)
-      # randomly initialize the board
-    end
-    def evolve
-      # apply rules to each cell and generate new state
-    end
-    def render
-      # render the current state of the board
-    end
-    def run(num_generations)
-      # evolve and render for num_generations
-    end
-  end
+require 'minitest/autorun'
+require_relative 'final_project.rb'
+
+class TestGameOfLife < Minitest::Unit::TestCase
+	attr_reader :game_1, :game_2, :game_3, :game_default, :cell_0_0, :cell_5_4, :cell_default, :cell_top_left, :cell_top_right, :cell_bottom_right, :cell_bottom_left, :game_neighbors
+	def setup
+		@game_1 = GameOfLife.new 10, 10, 30
+		@game_2 = GameOfLife.new 20, 15, 100
+		@game_3 = GameOfLife.new 99, 4, 111
+		@game_default = GameOfLife.new         # if no params are passed
+		@game_neighbors = GameOfLife.new 20, 70
+
+		@cell_0_0 = Cell.new 0, 0
+		@cell_5_4 = Cell.new 5, 4
+		@cell_default = Cell.new
+		@cell_top_left = Cell.new 0, 0
+		@cell_top_right = Cell.new 5, 0
+		@cell_bottom_right = Cell.new 5, 3
+		@cell_bottom_left = Cell.new 0, 3
+	end
+
+	def test_initialize
+		refute_nil @size
+		assert_equal @game_1.width, 10
+		assert_equal @game_2.height, 20
+		assert_equal @game_3.num_generations, 111
+		assert_equal @game_default.width, 5
+		assert_equal @game_default.height, 4
+		assert_equal @game_default.num_generations, 10
+
+		assert_instance_of Array, @game_1.board
+		@game_1.board.each do |row|
+			#puts "in loop"
+			assert row.instance_of? Array
+		end
+
+		assert_equal self.cell_5_4.x, 5
+		assert_equal self.cell_5_4.y, 4
+		assert_equal self.cell_0_0.x, 0
+		assert_equal self.cell_0_0.y, 0
+		assert_equal self.cell_default.x, 1
+		assert_equal self.cell_default.y, 2
+	end
+
+	def test_evolve
+		assert_respond_to self.game_neighbors, :evolve
+		self.game_neighbors.evolve
+	end
+
+	def test_neighbors
+		puts ""
+		puts ""
+		puts ""
+		puts self.game_neighbors.to_s
+		puts ""
+		puts ""
+		assert_respond_to self.game_neighbors, :neighbors
+		assert_equal self.game_neighbors.neighbors(self.cell_0_0), x
+		self.game_neighbors.neighbors(Cell.new 1, 1)
+
+		assert_equal self.game_neighbors.neighbors(self.cell_top_left), true
+		assert_equal self.game_neighbors.neighbors(Cell.new(0, 1)), true
+
+
+		assert_equal self.game_neighbors.neighbors(self.cell_top_left), "top left cell"
+		assert_equal self.game_neighbors.neighbors(self.cell_top_right), "top right cell"
+		assert_equal self.game_neighbors.neighbors(self.cell_top_right), "bottom right cell"
+		assert_equal self.game_neighbors.neighbors(self.cell_top_right), "bottom left cell"
+
+		assert_equal self.game_1.width-1, self.game_1.neighbors(self.cell_0_0).y
+		assert_equal self.game_1.height-1, self.game_1.neighbors(self.cell_0_0).x
+		assert_equal self.game_2.height-1, self.game_2.neighbors(self.cell_0_0).x
+		assert_equal self.game_2.width-1, self.game_2.neighbors(self.cell_0_0).y
+		
+	end
+
+
+	def test_render
+		assert_respond_to self.game_neighbors, :render
+	end
+
+	def test_run
+		assert_respond_to self.game_neighbors, :run
+	end
 end