diff --git a/SamaPager_Server/Server.cs b/SamaPager_Server/Server.cs
index 29aee6d..df7d4e9 100644
--- a/SamaPager_Server/Server.cs
+++ b/SamaPager_Server/Server.cs
@@ -46,7 +46,15 @@ namespace SamaPager_Server
                 case "!getDateTime":
                     bytesToSend = Encoding.UTF8.GetBytes($"Hi, it's {DateTime.Now}");
                     this.UdpServer.Send(bytesToSend, bytesToSend.Length, receiveEndPoint);
-                    return $"Time command received by {receiveEndPoint}, sent local server time";
+                    return $"Command \"!getDateTime\" received by {receiveEndPoint}, sent local server time";
+                case "!getCurrentDir":
+                    bytesToSend = Encoding.UTF8.GetBytes($"I'm working in {Environment.CurrentDirectory}");
+                    this.UdpServer.Send(bytesToSend, bytesToSend.Length, receiveEndPoint);
+                    return $"Command \"!getCurrentDir\" received by {receiveEndPoint}, sent server working directory";
+                case "!getCurrentUser":
+                    bytesToSend = Encoding.UTF8.GetBytes($"Hi, I'm running as {Environment.UserName}");
+                    this.UdpServer.Send(bytesToSend, bytesToSend.Length, receiveEndPoint);
+                    return $"Time command received by {receiveEndPoint}, sent the user server is running on";
                 default:
                     return $"[{DateTime.Now}] {receiveEndPoint}: {receivedMessage}";
             }