diff --git a/src/main/java/EventListener.java b/src/main/java/EventListener.java
index 9119f82..2306a28 100644
--- a/src/main/java/EventListener.java
+++ b/src/main/java/EventListener.java
@@ -1,4 +1,4 @@
-public class EventListener {
+public class EventListener extends Thread{
 
     private String messageToListenFor;
     private String messageToReplyWith;
@@ -17,16 +17,28 @@ public EventListener(String message, String reply, Tracker tracker) {
     }
 
     public void run() {
+        while(!readyToQuit())
+        {
+            while(shouldReply())
+            {
+                reply();
+            }
+        }
     }
 
     public Boolean readyToQuit() {
-        return null;
+
+        return eventTracker.has("quit");
     }
 
     public Boolean shouldReply() {
-        return null;
+
+        return eventTracker.has(messageToListenFor);
     }
 
     public void reply() {
+        eventTracker.handle(messageToListenFor, () -> {
+            System.out.println(messageToReplyWith);
+        });
     }
 }
\ No newline at end of file
diff --git a/src/main/java/EventTracker.java b/src/main/java/EventTracker.java
index 84885a4..f6d5f83 100644
--- a/src/main/java/EventTracker.java
+++ b/src/main/java/EventTracker.java
@@ -7,22 +7,45 @@ public class EventTracker implements Tracker {
 
     private Map<String, Integer> tracker;
 
+    public Map<String, Integer> getTracker() {
+        return this.tracker;
+    }
+
+    public void setTracker(Map<String, Integer> tracker) {
+        this.tracker = tracker;
+    }
+
     private EventTracker() {
         this.tracker = new HashMap<>();
     }
 
     synchronized public static EventTracker getInstance() {
-        return null;
+        return INSTANCE;
     }
 
     synchronized public void push(String message) {
+        Integer x=tracker.getOrDefault(message,0);
+        tracker.put(message,x+1);
     }
 
     synchronized public Boolean has(String message) {
-        return null;
+        return tracker.containsKey(message);
     }
 
     synchronized public void handle(String message, EventHandler e) {
+        try {
+           // e.handle();
+            Integer x=tracker.getOrDefault(message,0);
+            if(x==1 && x!=0)
+            {
+                this.tracker.remove(message);
+            }
+            else
+                this.tracker.put(message,x-1);
+
+        } catch (NullPointerException n) {
+            System.out.println("Currently not being tracked.");
+        }
     }
 
     // Do not use this. This constructor is for tests only
diff --git a/src/test/java/EventListenerTest.java b/src/test/java/EventListenerTest.java
index 3d4b2eb..bd743d4 100644
--- a/src/test/java/EventListenerTest.java
+++ b/src/test/java/EventListenerTest.java
@@ -10,7 +10,6 @@ public class EventListenerTest {
     public void readToQuit() {
         TrackerMock tracker = new TrackerMock();
         EventListener el = new EventListener("test", "reply", tracker);
-
         Assert.assertTrue(el.readyToQuit());
     }
 
@@ -37,7 +36,7 @@ class TrackerMock implements Tracker {
         public boolean itemWasPushed;
         public boolean eventWasHandled;
 
-        @Override
+       // @Override
         public Map<String, Integer> tracker() {
             return null;
         }
@@ -48,7 +47,7 @@ public void push(String message) {
         }
 
         @Override
-        public boolean has(String message) {
+        public Boolean has(String message) {
             return true;
         }
 
diff --git a/src/test/java/EventTrackerTest.java b/src/test/java/EventTrackerTest.java
index 11cab9d..c8a4735 100644
--- a/src/test/java/EventTrackerTest.java
+++ b/src/test/java/EventTrackerTest.java
@@ -1,9 +1,7 @@
 import org.junit.Assert;
 import org.junit.Test;
-
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
+
 
 public class EventTrackerTest {
 
@@ -32,7 +30,7 @@ public void tracker() {
 
         eventTracker.push("test");
 
-        Assert.assertEquals(testList, eventTracker.tracker());
+        Assert.assertEquals(testList, eventTracker.getTracker());
 
     }