diff --git a/include/queue/queue.tpp b/include/queue/queue.tpp
index b7f341c..2a71b9f 100644
--- a/include/queue/queue.tpp
+++ b/include/queue/queue.tpp
@@ -18,19 +18,36 @@ void Queue<Data>::clear() {
 
 template<class Data>
 void Queue<Data>::push(Data data) {
+    if (size() >= QUEUE_SIZE - 1) {
+        throw std::overflow_error("Queue is full");
+    }
+    buffer[ep] = data;
+    ep = (ep + 1) % QUEUE_SIZE;
 }
 
 template<class Data>
 Data Queue<Data>::pull() {
-    return buffer[sp];
+    if (size() == 0) {
+        throw std::underflow_error("Queue is empty");
+    }
+    Data data = buffer[sp];
+    sp = (sp + 1) % QUEUE_SIZE;
+    return data;
 }
 
 template<class Data>
 Data Queue<Data>::top() {
+    if (size() == 0) {
+        throw std::underflow_error("Queue is empty (top)");
+    }
     return buffer[sp];
 }
 
 template<class Data>
 int Queue<Data>::size() {
-    return 0;
+    if (ep >= sp) {
+        return ep - sp;
+    } else {
+        return QUEUE_SIZE - sp + ep;
+    }
 }
\ No newline at end of file