diff --git a/pubsub.go b/pubsub.go
index 9413a45..1148a12 100644
--- a/pubsub.go
+++ b/pubsub.go
@@ -2,33 +2,79 @@ package main
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
+	"slices"
 	"time"
 )
 
-type PubSub struct {
+type SubClients struct {
+	id      string
 	channel chan string
 }
 
+type PubSub struct {
+	topics map[string][]*SubClients
+}
+
 func NewPubSub() *PubSub {
-	return &PubSub{channel: make(chan string)}
+	return &PubSub{topics: make(map[string][]*SubClients)}
+}
+
+func (p *PubSub) getOrCreateTopic(topicName, requestId string) *SubClients {
+	clients, exists := p.topics[topicName]
+	if exists == false {
+		clients = []*SubClients{}
+		p.topics[topicName] = clients
+	}
+
+	var currClient *SubClients
+	for _, client := range clients {
+		if client.id == requestId {
+			currClient = client
+			break
+		}
+	}
+
+	if currClient == nil {
+		currClient = &SubClients{id: requestId, channel: make(chan string)}
+		p.topics[topicName] = append(p.topics[topicName], currClient)
+	}
+
+	return currClient
 }
 
 func (p *PubSub) HandleSubscribe(w http.ResponseWriter, r *http.Request) {
+	topicName := r.URL.Query().Get("topic")
+	clientInTopic := p.getOrCreateTopic(topicName, r.Context().Value("REQUEST_ID").(string))
+
 	w.Header().Set("Content-Type", "text/event-stream")
 	w.Header().Set("Connection", "keep-alive")
 	w.Header().Set("Cache-Control", "no-cache")
 
-	clientGone := r.Context().Done()
-
 	rc := http.NewResponseController(w)
 	for {
 		select {
-		case <-clientGone:
+		case <-r.Context().Done():
 			fmt.Println("Client disconnected")
+
+			var index int
+			for i, client := range p.topics[topicName] {
+				if client.id == clientInTopic.id {
+					index = i
+					break
+				}
+			}
+
+			p.topics[topicName] = slices.Delete(p.topics[topicName], index, index+1)
+
+			if len(p.topics[topicName]) == 0 {
+				delete(p.topics, topicName)
+			}
+
 			return
-		case data := <-p.channel:
+		case data := <-clientInTopic.channel:
 			_, err := fmt.Fprintf(w, "data: %s\n", data)
 			if err != nil {
 				return
@@ -47,13 +93,22 @@ type Input struct {
 }
 
 func (p *PubSub) HandlePublish(w http.ResponseWriter, r *http.Request) {
+	topicName := r.URL.Query().Get("topic")
+	topic, exists := p.topics[topicName]
+	if !exists {
+		http.Error(w, errors.New("'topic' is not registered").Error(), http.StatusBadRequest)
+		return
+	}
+
 	var input Input
 	if err := json.NewDecoder(r.Body).Decode(&input); err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
 
-	p.channel <- fmt.Sprintf("%+v", input)
+	for _, client := range topic {
+		client.channel <- fmt.Sprintf("%+v", input)
+	}
 
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)