diff --git a/mods/uptime/uptime.c b/mods/uptime/uptime.c
index f3f17c1..c1d149a 100755
--- a/mods/uptime/uptime.c
+++ b/mods/uptime/uptime.c
@@ -1,3 +1,5 @@
+#define MY_DLL_EXPORTS 1
+
 #include "irc.h"
 #include "events.h"
 #include "module.h"
@@ -5,8 +7,107 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef _WIN32
+#define BUFFER_SIZE 512
+#include <windows.h>
+DWORD startTick;
+
+void parseUptime(const char *output, struct irc_conn *bot, const char *where) {
+    // Variable definitions moved to the top
+    const char *keyword = "Statistics since ";
+    const char *uptime_start;
+    int month, day, year, hour, minute;
+    SYSTEMTIME uptime_systemtime, current_time;
+    ULONGLONG uptime_ticks, current_ticks;
+    ULONGLONG uptime_seconds;
+    int days, hours, minutes;
+
+
+    uptime_start = strstr(output, keyword);
+    if (uptime_start == NULL) {
+        printf("Failed to parse uptime information.\n");
+        return;
+    }
+
+    // Skip the "Statistics since " keyword
+    uptime_start += strlen(keyword);
+
+    // Parse the date and time
+    if (sscanf(uptime_start, "%d/%d/%d %d:%d", &month, &day, &year, &hour, &minute) != 5) {
+        printf("Failed to parse date and time.\n");
+        return;
+    }
+
+    // Get the current time
+    GetLocalTime(&current_time);
+
+    
+    // Calculate the uptime
+    uptime_systemtime.wYear = year;
+    uptime_systemtime.wMonth = month;
+    uptime_systemtime.wDayOfWeek = 0;
+    uptime_systemtime.wDay = day;
+    uptime_systemtime.wHour = hour;
+    uptime_systemtime.wMinute = minute;
+    uptime_systemtime.wSecond = 0;
+    uptime_systemtime.wMilliseconds = 0;
+
+
+    SystemTimeToFileTime(&uptime_systemtime, (FILETIME *)&uptime_ticks);
+    SystemTimeToFileTime(&current_time, (FILETIME *)&current_ticks);
+
+    uptime_seconds = (current_ticks - uptime_ticks) / 10000000UL; // Convert to seconds
+
+    uptime_seconds -= 1320;
+
+    days = uptime_seconds / (24 * 3600);
+    hours = (uptime_seconds % (24 * 3600)) / 3600;
+    minutes = (uptime_seconds % 3600) / 60;
+    irc_privmsg(bot, where, "Uptime: %d days, %d hours, %d minutes\n", days, hours, minutes);
+}
+
+char *executeCommand(const char *command)
+{
+    char buffer[BUFFER_SIZE];
+    char *old_result = NULL;
+    char *result = NULL;
+    FILE *fp;
+
+    fp = _popen(command, "r");
+    if (fp == NULL) {
+        printf("Failed to run command\n");
+        exit(1);
+    }
+
+    while (fgets(buffer, sizeof(buffer), fp) != NULL) {
+        if (result == NULL) {
+            result = _strdup(buffer);
+        } else {
+            old_result = result;
+            result = malloc(strlen(old_result) + strlen(buffer) + 1);
+            strcpy(result, old_result);
+            strcat(result, buffer);
+            free(old_result);
+        }
+    }
+
+    _pclose(fp);
+    return result;
+}
+#endif
+
 MY_API void up(struct irc_conn *bot, char *user, char *host, char *chan, char *text)
 {
+#ifdef _WIN32
+    const char *command = "net statistics server";
+    char *output = executeCommand(command);
+
+    if (!strcmp(text, "!uptime"))
+    {
+        parseUptime(output, bot, chan);
+        free(output);
+    }
+#else
 	char buf[100];
 	FILE* file;
 
@@ -20,11 +121,15 @@ MY_API void up(struct irc_conn *bot, char *user, char *host, char *chan, char *t
 
 		 irc_privmsg(bot, chan, "%s", buf);
 	}
-
+#endif
 }
 
 MY_API void mod_init()
 {
+#ifdef _WIN32
+    startTick = GetTickCount();
+#endif
+
     register_module("uptime", "Aaron Blakely", "v0.1", "Uptime module");
     printf("installing up handler\n");
 	add_handler(PRIVMSG_CHAN, up);
diff --git a/src/irc.c b/src/irc.c
index 83f3429..de77489 100755
--- a/src/irc.c
+++ b/src/irc.c
@@ -315,7 +315,7 @@ void irc_parse_raw(struct irc_conn *bot, char *raw)
 #ifdef _WIN32
         _snprintf(bot->nick, sizeof bot->nick, "%s_", bot->nick);
 #else
-        snprintf(bot->nick, sizeof bot->nick, "%s_", bot->nick);
+        sprintf(bot->nick, "%s_", bot->nick);
 #endif
         irc_raw(bot, "NICK %s", bot->nick);
     }
diff --git a/xbot.cfg b/xbot.cfg
index 90d23ff..12326e5 100755
--- a/xbot.cfg
+++ b/xbot.cfg
@@ -3,7 +3,7 @@
 bot:
 {
 	verbose = 1;
-	nick = "Lini";
+	nick = "X";
 	user = "xbot";
 	admin = "ab3800";
 };