diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index ad448772..14c21499 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -492,6 +492,12 @@ void Core::DebugCommandHandler::replay( char * data, Entity::Player& player, boo
       if( pSession )
          pSession->stopReplay();
    }
+   else if( subCommand == "info" )
+   {
+      auto pSession = g_serverZone.getSession( player.getId() );
+      if( pSession )
+         pSession->sendReplayInfo();
+   }
    else
    {
       player.sendUrgent( subCommand + " is not a valid replay command." );
diff --git a/src/servers/sapphire_zone/Session.cpp b/src/servers/sapphire_zone/Session.cpp
index 44095116..655f9fdb 100644
--- a/src/servers/sapphire_zone/Session.cpp
+++ b/src/servers/sapphire_zone/Session.cpp
@@ -128,7 +128,7 @@ void Core::Session::startReplay( const std::string& path )
    {
       // Get the filename of the current element
       auto fileName = it->path().filename().string();
-      auto unixTime = atoi( fileName.substr( 0, 10 ).c_str() );
+      auto unixTime = std::stoull( fileName.substr( 0, 14 ).c_str() );
 
       if( unixTime > 1000000000 )
       {
@@ -142,12 +142,12 @@ void Core::Session::startReplay( const std::string& path )
       return std::get< 0 >( left ) < std::get< 0 >( right );
    } );
 
-   int startTime = std::get< 0 >( loadedSets.at( 0 ) );
+   uint64_t startTime = std::get< 0 >( loadedSets.at( 0 ) );
 
    for( auto set : loadedSets )
    {
       m_replayCache.push_back( std::tuple< uint64_t, std::string >(
-         Util::getTimeSeconds() + ( std::get< 0 >( set ) - startTime ), std::get< 1 >( set ) ) );
+         Util::getTimeMs() + ( std::get< 0 >( set ) - startTime ), std::get< 1 >( set ) ) );
 
       g_log.info( "Registering " + std::get< 1 >( set ) + " for " + std::to_string( std::get< 0 >( set ) - startTime ) );
    }
@@ -167,13 +167,29 @@ void Core::Session::processReplay()
    int at = 0;
    for( const auto& set : m_replayCache )
    {
-      if( std::get< 0 >( set ) == Util::getTimeSeconds() )
+      if( std::get< 0 >( set ) <= Util::getTimeMs() )
       {
          m_pZoneConnection->injectPacket( std::get< 1 >( set ), *getPlayer().get() );
          m_replayCache.erase( m_replayCache.begin() + at );
+         g_log.info( "Sent for " + std::to_string( std::get< 0 >( set ) ) + ", left: " + std::to_string( m_replayCache.size() ) );
       }
       at++;
    }
+
+   if( m_replayCache.size() == 0 )
+      m_isReplaying = false;
+}
+
+void Core::Session::sendReplayInfo()
+{
+   std::string message = std::to_string( m_replayCache.size() ) + " Sets left in cache, ";
+
+   if( m_isReplaying )
+      message += " is active";
+   else
+      message += " is idle";
+
+   getPlayer()->sendDebug( message );
 }
 
 void Core::Session::update()
diff --git a/src/servers/sapphire_zone/Session.h b/src/servers/sapphire_zone/Session.h
index 99ce4cdd..1d59665b 100644
--- a/src/servers/sapphire_zone/Session.h
+++ b/src/servers/sapphire_zone/Session.h
@@ -29,6 +29,7 @@ namespace Core {
       void startReplay( const std::string& folderpath );
       void stopReplay();
       void processReplay();
+      void sendReplayInfo();
 
       void close();