diff --git a/cmd/bot/bot.go b/cmd/bot/bot.go
index a6dfc47..8b1db43 100644
--- a/cmd/bot/bot.go
+++ b/cmd/bot/bot.go
@@ -31,6 +31,10 @@ func (b *Bot) Connect() error {
 		handlers.HandlePrivateMessage(message, b.twitchClient, cfg)
 	})
 
+	b.twitchClient.OnWhisperMessage(func(message twitch.WhisperMessage) {
+		handlers.HandleWhisperMessage(message, b.twitchClient)
+	})
+
 	err := b.twitchClient.Connect()
 	if err != nil {
 		log.Error("Error Connecting from Twitch: ", err)
diff --git a/pkg/handlers/privatemessage.go b/pkg/handlers/privatemessage.go
index 9ca8131..eb2745a 100644
--- a/pkg/handlers/privatemessage.go
+++ b/pkg/handlers/privatemessage.go
@@ -43,8 +43,7 @@ func HandlePrivateMessage(message twitch.PrivateMessage, client *twitch.Client,
 		}
 	}
 
-	// Message was no command, just log it for now
-	// TODO: Add actual message logger
-	log.Info(message)
+	// Message was no command
+	// log.Info(message)
 
 }
diff --git a/pkg/handlers/whisper.go b/pkg/handlers/whisper.go
new file mode 100644
index 0000000..d8e10a9
--- /dev/null
+++ b/pkg/handlers/whisper.go
@@ -0,0 +1,14 @@
+package handlers
+
+import (
+	"github.com/gempir/go-twitch-irc/v2"
+	log "github.com/sirupsen/logrus"
+)
+
+func HandleWhisperMessage(whisper twitch.WhisperMessage, client *twitch.Client) {
+	log.Info("fn HandleWhisperMessage")
+	log.Info(whisper)
+	if whisper.Message == "xd" {
+		client.Whisper(whisper.User.Name, "xd")
+	}
+}