diff --git a/lib/heap_sort.rb b/lib/heap_sort.rb
index c8a32a4..93daaad 100644
--- a/lib/heap_sort.rb
+++ b/lib/heap_sort.rb
@@ -1,8 +1,18 @@
-
+require_relative 'min_heap'
 
 # This method uses a heap to sort an array.
-# Time Complexity:  ?
-# Space Complexity: ?
+# Time Complexity:  O(n log n) where n is the number of elements in the given array
+# Space Complexity: O(n)
 def heap_sort(list)
-  raise NotImplementedError, "Method not implemented yet..."
+  heap = []
+  list.each_with_index do |element, current|
+    heap << element
+    parent = current / 2
+    while heap[current] < heap[parent] do
+      heap[parent], heap[current] = heap[current], heap[parent]
+      current = parent
+      parent = current / 2
+    end
+  end
+  return heap
 end
\ No newline at end of file
diff --git a/lib/min_heap.rb b/lib/min_heap.rb
index 6eaa630..58192f1 100644
--- a/lib/min_heap.rb
+++ b/lib/min_heap.rb
@@ -14,21 +14,26 @@ def initialize
   end
 
   # This method adds a HeapNode instance to the heap
-  # Time Complexity: ?
-  # Space Complexity: ?
+  # Time Complexity: O(log n) where n is the number of nodes in the heap
+  # Space Complexity: O(2) == O(1)
   def add(key, value = key)
-    raise NotImplementedError, "Method not implemented yet..."
+    @store << HeapNode.new(key, value)
+    heap_up(@store.length - 1)
+    return @store
   end
 
   # This method removes and returns an element from the heap
   #   maintaining the heap structure
-  # Time Complexity: ?
-  # Space Complexity: ?
+  # Time Complexity: O(log n) where n is the number of nodes in the heap
+  # Space Complexity: O(2) == O(1)
   def remove()
-    raise NotImplementedError, "Method not implemented yet..."
+    return nil if empty?
+    @store[0], @store[-1] = @store[-1], @store[0]
+    removed_node = @store.pop
+    heap_down(0)
+    return removed_node.value
   end
 
-
   # Used for Testing
   def to_s
     return "[]" if @store.empty?
@@ -39,33 +44,52 @@ def to_s
     end
 
     output += @store.last.value + "]"
-      
+
     return output
   end
 
   # This method returns true if the heap is empty
-  # Time complexity: ?
-  # Space complexity: ?
+  # Time complexity: O(1) ? I think the length of arrays is somehow cached or something in Ruby? If not, then O(n) where n is the number of elements in the array
+  # Space complexity: O(1)
   def empty?
-    raise NotImplementedError, "Method not implemented yet..."
+    return @store.length == 0
   end
 
   private
 
   # This helper method takes an index and
-  #  moves it up the heap, if it is less than it's parent node.
+  #  moves it up the heap, if it is less than its parent node.
   #  It could be **very** helpful for the add method.
-  # Time complexity: ?
-  # Space complexity: ?
-  def heap_up(index)
-    
+  # Time complexity: O(log n) where n is the number of nodes in the heap
+  # Space complexity: O(1)
+  def heap_up(current)
+    parent = (current - 1) / 2
+    while @store[current].key < @store[parent].key do
+      @store[parent], @store[current] = @store[current], @store[parent]
+      current = parent
+      parent = current / 2
+    end
   end
 
-  # This helper method takes an index and 
-  #  moves it up the heap if it's smaller
-  #  than it's parent node.
-  def heap_down(index)
-    raise NotImplementedError, "Method not implemented yet..."
+  # This helper method takes an index and
+  #  moves it down the heap if it's larger
+  #  than its child nodes.
+  def heap_down(current)
+    current = 0
+    left_child = current * 2 + 1
+    right_child = current * 2 + 2
+    child = @store[left_child].key < @store[right_child].key ? left_child : right_child
+
+    while @store[current].key > @store[child].key do
+      @store[child], @store[current] = @store[current], @store[child]
+
+      current = child
+      left_child = current * 2 + 1
+      right_child = current * 2 + 2
+      if @store[left_child] && @store[right_child]
+        child = @store[left_child].key < @store[right_child].key ? left_child : right_child
+      end
+    end
   end
 
   # If you want a swap method... you're welcome
@@ -74,4 +98,4 @@ def swap(index_1, index_2)
     @store[index_1] = @store[index_2]
     @store[index_2] = temp
   end
-end
\ No newline at end of file
+end
diff --git a/test/heapsort_test.rb b/test/heapsort_test.rb
index 34402ac..76e3fdc 100644
--- a/test/heapsort_test.rb
+++ b/test/heapsort_test.rb
@@ -1,12 +1,12 @@
 require_relative "test_helper"
 
-xdescribe "heapsort" do
+describe "heap_sort" do
   it "sorts an empty array" do
     # Arrange 
     list = []
 
     # Act
-    result = heapsort(list)
+    result = heap_sort(list)
 
     # Assert
     expect(result).must_equal []
@@ -17,7 +17,7 @@
     list = [5]
 
     # Act
-    result = heapsort(list)
+    result = heap_sort(list)
 
     # Assert
     expect(result).must_equal [5]
@@ -28,7 +28,7 @@
     list = [5, 27, 3, 16, -50]
 
     # Act
-    result = heapsort(list)
+    result = heap_sort(list)
 
     # Assert
     expect(result).must_equal [-50, 3, 5, 16, 27]