diff --git a/lib/heap_sort.rb b/lib/heap_sort.rb
index c8a32a4..e20162a 100644
--- a/lib/heap_sort.rb
+++ b/lib/heap_sort.rb
@@ -1,8 +1,20 @@
-
+require_relative './min_heap';
 
 # This method uses a heap to sort an array.
-# Time Complexity:  ?
-# Space Complexity: ?
-def heap_sort(list)
-  raise NotImplementedError, "Method not implemented yet..."
+# Time Complexity:  O(n), where n is the number of nodes
+# Space Complexity: O(1)
+def heapsort(list)
+  return list if list.empty? || list.length == 1
+
+  minHeap = MinHeap.new()
+
+  until list.empty?
+    minHeap.add(list.pop)
+  end
+
+  until minHeap.empty?
+    list << minHeap.remove
+  end
+
+  return list
 end
\ No newline at end of file
diff --git a/lib/min_heap.rb b/lib/min_heap.rb
index 6eaa630..de89021 100644
--- a/lib/min_heap.rb
+++ b/lib/min_heap.rb
@@ -14,18 +14,23 @@ 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 (at worst there might need to a be a swap at every level)
+  # Space Complexity: O(1)
   def add(key, value = key)
-    raise NotImplementedError, "Method not implemented yet..."
+    heap_node = HeapNode.new(key, value)
+    @store.push(heap_node)
+    heap_up(@store.length - 1)
   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 (at worst there might need to a be a swap at every level)
+  # Space Complexity: O(1)
   def remove()
-    raise NotImplementedError, "Method not implemented yet..."
+    swap(0, @store.length - 1)
+    removed_node = @store.pop
+    heap_down(0)
+    return removed_node.value
   end
 
 
@@ -39,15 +44,17 @@ 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(n)
+  # Space complexity: O(1)
   def empty?
-    raise NotImplementedError, "Method not implemented yet..."
+    if @store.empty?
+      return
+    end
   end
 
   private
@@ -55,17 +62,45 @@ def empty?
   # This helper method takes an index and
   #  moves it up the heap, if it is less than it's parent node.
   #  It could be **very** helpful for the add method.
-  # Time complexity: ?
-  # Space complexity: ?
+  # Time complexity: O(n) where n is the number of nodes
+  # Space complexity: O(1)
   def heap_up(index)
-    
+    parent_index = (index - 1) / 2
+
+    if parent_index >= 0
+      if @store[parent_index].key > @store[index].key
+        swap(parent_index, index)
+        heap_up(parent_index)
+      end
+    end
+    return
   end
 
-  # This helper method takes an index and 
+  # 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..."
+    left_child = (index * 2) + 1
+    right_child = (index * 2) + 2
+
+    if @store[left_child].nil?
+      return
+    end
+
+    if @store[right_child].nil?
+      if @store[left_child].key < @store[index].key
+        swap(index, left_child)
+      end
+      return
+    end
+
+    if @store[left_child].key < @store[right_child].key
+      swap(index, left_child)
+      heap_down(left_child)
+    else
+      swap(index, right_child)
+      heap_down(right_child)
+    end
   end
 
   # If you want a swap method... you're welcome
diff --git a/test/heapsort_test.rb b/test/heapsort_test.rb
index 34402ac..fb7fa84 100644
--- a/test/heapsort_test.rb
+++ b/test/heapsort_test.rb
@@ -1,8 +1,8 @@
 require_relative "test_helper"
 
-xdescribe "heapsort" do
+describe "heapsort" do
   it "sorts an empty array" do
-    # Arrange 
+    # Arrange
     list = []
 
     # Act
@@ -13,7 +13,7 @@
   end
 
   it "can sort a 1-element array" do
-    # Arrange 
+    # Arrange
     list = [5]
 
     # Act
@@ -22,9 +22,9 @@
     # Assert
     expect(result).must_equal [5]
   end
-  
+
   it "can sort a 5-element array" do
-    # Arrange 
+    # Arrange
     list = [5, 27, 3, 16, -50]
 
     # Act
@@ -32,5 +32,5 @@
 
     # Assert
     expect(result).must_equal [-50, 3, 5, 16, 27]
-  end  
+  end
 end
\ No newline at end of file