diff --git a/heaps/heap_sort.py b/heaps/heap_sort.py
index 3b834a5..6b3b5b6 100644
--- a/heaps/heap_sort.py
+++ b/heaps/heap_sort.py
@@ -1,8 +1,16 @@
-
+from heaps.min_heap import MinHeap
 
 def heap_sort(list):
     """ This method uses a heap to sort an array.
-        Time Complexity:  ?
+        Time Complexity:  O(log n)
         Space Complexity: ?
     """
-    pass
\ No newline at end of file
+    heap = MinHeap()
+    for num in list:
+        heap.add(num)
+    
+    heap_list = []
+    while heap.store:
+        num = heap.remove()
+        heap_list.append(num)
+    return heap_list
\ No newline at end of file
diff --git a/heaps/min_heap.py b/heaps/min_heap.py
index a1340e3..26deb57 100644
--- a/heaps/min_heap.py
+++ b/heaps/min_heap.py
@@ -1,36 +1,50 @@
 class HeapNode:
-  
-    def initialize(self, key, value):
+    def __init__(self, key, value):
         self.key = key
         self.value = value
 
-
+    def __str__(self):
+        return str(self.value)
+        
 class MinHeap:
-
     def __init__(self):
-        self.store = []
-
+        self.store = [] # this is the list where we store stuff
 
     def add(self, key, value = None):
-        """ This method adds a HeapNode instance to the heap
-            If value == None the new node's value should be set to key
-            Time Complexity: ?
-            Space Complexity: ?
+        """ 
+        This method adds a HeapNode instance to the heap
+        If value == None the new node's value should be set to key
+        Time Complexity: O(logn)
+        Space Complexity: O(n)
         """
-        pass
+        if not value:
+            value = key
+        self.store.append(HeapNode(key, value))
+        # we will append a new value to the end of the heap
+        # Compare the new node with it's parent
+        # If they are out of order swap and heap-up
+        # using the parent's index number.
+        self.heap_up(len(self.store) - 1)
 
     def remove(self):
-        """ This method removes and returns an element from the heap
-            maintaining the heap structure
-            Time Complexity: ?
-            Space Complexity: ?
+        """ 
+        This method removes and returns an element from the heap
+        maintaining the heap structure
+        Time Complexity: ?
+        Space Complexity: ?
         """
-        pass
+        if self.empty():
+            return None
 
+        self.swap(0, len(self.store) - 1)
+        remove_val = self.store.pop()
+        self.heap_down(0)
 
+        return remove_val.value
     
     def __str__(self):
-        """ This method lets you print the heap, when you're testing your app.
+        """ 
+        This method lets you print the heap, when you're testing your app.
         """
         if len(self.store) == 0:
             return "[]"
@@ -38,35 +52,58 @@ def __str__(self):
 
 
     def empty(self):
-        """ This method returns true if the heap is empty
-            Time complexity: ?
-            Space complexity: ?
+        """ 
+        This method returns true if the heap is empty
+        Time complexity: O(1)
+        Space complexity: O(1)
         """
-        pass
+        return len(self.store) == 0
 
 
     def heap_up(self, index):
-        """ 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: ?
         """
-        pass
+        This helper method takes an index and
+        moves the corresponding element up the heap, if 
+        it is less than it's parent node until the Heap
+        property is reestablished.
+        This could be **very** helpful for the add method.
+        Time complexity: O()
+        Space complexity: 0()
+        """
+        parent_index = (index-1)//2
+        while index>0 and self.store[index].key < self.store[parent_index].key:
+            self.swap(index,parent_index)
+            index = parent_index
+            parent_index = (index-1)//2
 
     def heap_down(self, index):
-        """ This helper method takes an index and 
-            moves it up the heap if it's smaller
-            than it's parent node.
+        """ 
+        This helper method takes an index and 
+        moves the corresponding element down the heap if it's 
+        larger than either of its children and continues until
+        the heap property is reestablished.
+        than it's parent node.
         """
-        pass
 
-    
+        childOne = index*2+1
+        childTwo = childOne+1
+
+        if len(self.store)>childTwo and self.store[childOne].key>self.store[childTwo].key:
+            childOne=childTwo
+
+        if len(self.store)<=childOne:
+            return None
+
+        if self.store[childOne].key<self.store[index].key:
+            self.swap(index,childOne)
+            self.heap_down(childOne)
+
     def swap(self, index_1, index_2):
-        """ Swaps two elements in self.store
-            at index_1 and index_2
-            used for heap_up & heap_down
+        """
+        Swaps two elements in self.store
+        at index_1 and index_2
+        used for heap_up & heap_down
         """
         temp = self.store[index_1]
         self.store[index_1] = self.store[index_2]
-        self.store[index_2] = temp
+        self.store[index_2] = temp
\ No newline at end of file