diff --git a/stacks_queues/queue.py b/stacks_queues/queue.py
index d66dab2..55cce14 100644
--- a/stacks_queues/queue.py
+++ b/stacks_queues/queue.py
@@ -15,7 +15,7 @@ def __init__(self):
         self.front = -1
         self.rear = -1
         self.size = 0
-      
+    
 
     def enqueue(self, element):
         """ Adds an element to the Queue
@@ -23,34 +23,58 @@ def enqueue(self, element):
             In the store are occupied
             returns None
         """
-        pass
+        if self.full():
+            raise QueueFullException("Queue is full")
+
+        if self.front == -1:
+            self.front = self.rear = 0
+
+        if self.full():
+            buffer_increase = int(self.buffer_size * 0.5)
+            self.store = self.store[:self.rear] + [None] * buffer_increase + self.store[self.front:]
+            self.buffer_size += buffer_increase
+            self.front += buffer_increase
+
+        self.store[self.rear] = element
+        self.rear = (self.rear + 1)% self.buffer_size
+        self.size += 1
 
     def dequeue(self):
         """ Removes and returns an element from the Queue
             Raises a QueueEmptyException if 
             The Queue is empty.
         """
-        pass
+        if self.empty():
+            raise QueueEmptyException("Queue is empty")
+        element = self.store[self.front]
+        self.front = (self.front + 1)% self.buffer_size
+        self.size -= 1
+        return element
 
     def front(self):
         """ Returns an element from the front
             of the Queue and None if the Queue
             is empty.  Does not remove anything.
         """
-        pass
+        if self.empty():
+            return None
+        return self.store[self.front]
         
 
     def size(self):
         """ Returns the number of elements in
             The Queue
         """
-        pass
+        return self.size
 
     def empty(self):
         """ Returns True if the Queue is empty
             And False otherwise.
         """
-        pass
+        return True if self.size == 0 else False
+
+    def full(self):
+        return self.size == self.buffer_size
 
     def __str__(self):
         """ Returns the Queue in String form like:
@@ -58,4 +82,8 @@ def __str__(self):
             Starting with the front of the Queue and
             ending with the rear of the Queue.
         """
-        pass
+        values = []
+        for i in range(self.front, self.front + self.size):
+            pos = i % self.buffer_size
+            values.append(self.store[pos])
+        return str(values)
diff --git a/stacks_queues/stack.py b/stacks_queues/stack.py
index 94fb2a6..e9faf52 100644
--- a/stacks_queues/stack.py
+++ b/stacks_queues/stack.py
@@ -12,7 +12,7 @@ def push(self, element):
         """ Adds an element to the top of the Stack.
             Returns None
         """
-        pass
+        self.store.add_first(element)
 
     def pop(self):
         """ Removes an element from the top
@@ -21,13 +21,15 @@ def pop(self):
             The Stack is empty.
             returns None
         """
-        pass
+        if self.empty():
+            raise StackEmptyException("stack is empty")
+        return self.store.remove_first()
 
     def empty(self):
         """ Returns True if the Stack is empty
             And False otherwise
         """
-        pass
+        return not self.store.get_first()
 
     def __str__(self):
         """ Returns the Stack in String form like:
@@ -35,4 +37,4 @@ def __str__(self):
             Starting with the top of the Stack and
             ending with the bottom of the Stack.
         """
-        pass
+        return "[" + str(self.store) + "]"