diff --git a/lib/addons/utils.rb b/lib/addons/utils.rb
new file mode 100644
index 0000000..79660a6
--- /dev/null
+++ b/lib/addons/utils.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Chronicle
+  module Matrix
+    # Ping - Pong. Useful for testing
+    #
+    # @param client [Client object] The current Matrix client connection
+    # @param message [Message object] The relevant message object
+    def handle_ping(client, message)
+      room = client.ensure_room message.room_id
+      
+      room.send_notice('Pong!')
+    end
+  end
+end