diff --git a/botthread.c b/botthread.c
index a9c2a36..7f1059c 100644
--- a/botthread.c
+++ b/botthread.c
@@ -40,6 +40,13 @@
   }
 
 int botNextSong() {
+  tuveChanList_t *tmpChans;
+  
+  for (tmpChans = channels;tmpChans != 0x0;tmpChans = tmpChans->next) {
+  	if (tmpChans->songEnd < time(NULL)) {
+  	  writeLog(0,"Need To Find Next Song For: %s\n",tmpChans->channel);
+      }
+    }
   }
 
 void *PrintHello(void *threadid) {
diff --git a/tuved.h b/tuved.h
index 2c1d2f2..9c1af80 100644
--- a/tuved.h
+++ b/tuved.h
@@ -27,7 +27,9 @@
   struct tuveChanList *next;
   struct tuveUserList *users;
   char   topic[128];
-  char   channel[32]; 
+  char   channel[32];
+  char   curSong[256];
+  int    songEnd;
   } tuveChanList_t;
 
 typedef struct tuveUserChans {