diff --git a/demboyz/demmessages/demhandlers.cpp b/demboyz/demmessages/demhandlers.cpp
index 3b0a6a7..034edd9 100644
--- a/demboyz/demmessages/demhandlers.cpp
+++ b/demboyz/demmessages/demhandlers.cpp
@@ -2,6 +2,32 @@
 #include "demhandlers.h"
 #include "demmessages.h"
 
+void DemHandlers::CreateDemMsgStructs(void* demDataStructs[9])
+{
+    demDataStructs[0] = new DemMsg::Dem_Unknown();
+    demDataStructs[1] = new DemMsg::Dem_Packet();
+    demDataStructs[2] = new DemMsg::Dem_Packet();
+    demDataStructs[3] = new DemMsg::Dem_SyncTick();
+    demDataStructs[4] = new DemMsg::Dem_ConsoleCmd();
+    demDataStructs[5] = new DemMsg::Dem_UserCmd();
+    demDataStructs[6] = new DemMsg::Dem_DataTables();
+    demDataStructs[7] = new DemMsg::Dem_Stop();
+    demDataStructs[8] = new DemMsg::Dem_StringTables();
+}
+
+void DemHandlers::DestroyDemMsgStructs(void* demDataStructs[9])
+{
+    delete reinterpret_cast<DemMsg::Dem_Unknown*>(demDataStructs[0]);
+    delete reinterpret_cast<DemMsg::Dem_Packet*>(demDataStructs[1]);
+    delete reinterpret_cast<DemMsg::Dem_Packet*>(demDataStructs[2]);
+    delete reinterpret_cast<DemMsg::Dem_SyncTick*>(demDataStructs[3]);
+    delete reinterpret_cast<DemMsg::Dem_ConsoleCmd*>(demDataStructs[4]);
+    delete reinterpret_cast<DemMsg::Dem_UserCmd*>(demDataStructs[5]);
+    delete reinterpret_cast<DemMsg::Dem_DataTables*>(demDataStructs[6]);
+    delete reinterpret_cast<DemMsg::Dem_Stop*>(demDataStructs[7]);
+    delete reinterpret_cast<DemMsg::Dem_StringTables*>(demDataStructs[8]);
+}
+
 #define DECLARE_DEM_HANDLER_ARRAY(funcname) \
     { \
         &DemHandlers::Dem_Unknown_##funcname, \
diff --git a/demboyz/demmessages/demhandlers.h b/demboyz/demmessages/demhandlers.h
index ed03eae..df6487d 100644
--- a/demboyz/demmessages/demhandlers.h
+++ b/demboyz/demmessages/demhandlers.h
@@ -45,6 +45,9 @@ using JsonWrite = base::JsonWriterFile;
 
 namespace DemHandlers
 {
+    void CreateDemMsgStructs(void* demDataStructs[9]);
+    void DestroyDemMsgStructs(void* demDataStructs[9]);
+
     bool DemMsg_FileRead(uint32_t type, FileRead& demofile, void* data);
     bool DemMsg_FileWrite(uint32_t type, FileWrite& demofile, void* data);
     bool DemMsg_JsonRead(uint32_t type, JsonRead& jsonbuf, void* data);
diff --git a/demboyz/io/demreader.cpp b/demboyz/io/demreader.cpp
index 8f3739a..ddf93a3 100644
--- a/demboyz/io/demreader.cpp
+++ b/demboyz/io/demreader.cpp
@@ -4,113 +4,14 @@
 #include "demofile/demofile.h"
 #include "demofile/demotypes.h"
 
-#include "netmessages/netmessages.h"
+#include "netmessages/nethandlers.h"
 #include "netmessages/netcontants.h"
-#include "demmessages/demmessages.h"
 #include "demmessages/demhandlers.h"
 #include "sourcesdk/bitbuf.h"
 #include <vector>
 #include <cstdint>
 #include <memory>
 
-static void CreateNetMsgStructs(void* netDataStructs[32])
-{
-    netDataStructs[0] = new NetMsg::Net_NOP();
-    netDataStructs[1] = new NetMsg::Net_Disconnect();
-    netDataStructs[2] = new NetMsg::Net_File();
-    netDataStructs[3] = new NetMsg::Net_Tick();
-    netDataStructs[4] = new NetMsg::Net_StringCmd();
-    netDataStructs[5] = new NetMsg::Net_SetConVar();
-    netDataStructs[6] = new NetMsg::Net_SignonState();
-    netDataStructs[7] = new NetMsg::SVC_Print();
-    netDataStructs[8] = new NetMsg::SVC_ServerInfo();
-    netDataStructs[9] = new NetMsg::SVC_SendTable();
-    netDataStructs[10] = new NetMsg::SVC_ClassInfo();
-    netDataStructs[11] = new NetMsg::SVC_SetPause();
-    netDataStructs[12] = new NetMsg::SVC_CreateStringTable();
-    netDataStructs[13] = new NetMsg::SVC_UpdateStringTable();
-    netDataStructs[14] = new NetMsg::SVC_VoiceInit();
-    netDataStructs[15] = new NetMsg::SVC_VoiceData();
-    netDataStructs[16] = new NetMsg::SVC_HLTV();
-    netDataStructs[17] = new NetMsg::SVC_Sounds();
-    netDataStructs[18] = new NetMsg::SVC_SetView();
-    netDataStructs[19] = new NetMsg::SVC_FixAngle();
-    netDataStructs[20] = new NetMsg::SVC_CrosshairAngle();
-    netDataStructs[21] = new NetMsg::SVC_BSPDecal();
-    netDataStructs[22] = new NetMsg::SVC_TerrainMod();
-    netDataStructs[23] = new NetMsg::SVC_UserMessage();
-    netDataStructs[24] = new NetMsg::SVC_EntityMessage();
-    netDataStructs[25] = new NetMsg::SVC_GameEvent();
-    netDataStructs[26] = new NetMsg::SVC_PacketEntities();
-    netDataStructs[27] = new NetMsg::SVC_TempEntities();
-    netDataStructs[28] = new NetMsg::SVC_Prefetch();
-    netDataStructs[29] = new NetMsg::SVC_Menu();
-    netDataStructs[30] = new NetMsg::SVC_GameEventList();
-    netDataStructs[31] = new NetMsg::SVC_GetCvarValue();
-}
-
-static void DestroyNetMsgStructs(void* netDataStructs[32])
-{
-    delete reinterpret_cast<NetMsg::Net_NOP*>(netDataStructs[0]);
-    delete reinterpret_cast<NetMsg::Net_Disconnect*>(netDataStructs[1]);
-    delete reinterpret_cast<NetMsg::Net_File*>(netDataStructs[2]);
-    delete reinterpret_cast<NetMsg::Net_Tick*>(netDataStructs[3]);
-    delete reinterpret_cast<NetMsg::Net_StringCmd*>(netDataStructs[4]);
-    delete reinterpret_cast<NetMsg::Net_SetConVar*>(netDataStructs[5]);
-    delete reinterpret_cast<NetMsg::Net_SignonState*>(netDataStructs[6]);
-    delete reinterpret_cast<NetMsg::SVC_Print*>(netDataStructs[7]);
-    delete reinterpret_cast<NetMsg::SVC_ServerInfo*>(netDataStructs[8]);
-    delete reinterpret_cast<NetMsg::SVC_SendTable*>(netDataStructs[9]);
-    delete reinterpret_cast<NetMsg::SVC_ClassInfo*>(netDataStructs[10]);
-    delete reinterpret_cast<NetMsg::SVC_SetPause*>(netDataStructs[11]);
-    delete reinterpret_cast<NetMsg::SVC_CreateStringTable*>(netDataStructs[12]);
-    delete reinterpret_cast<NetMsg::SVC_UpdateStringTable*>(netDataStructs[13]);
-    delete reinterpret_cast<NetMsg::SVC_VoiceInit*>(netDataStructs[14]);
-    delete reinterpret_cast<NetMsg::SVC_VoiceData*>(netDataStructs[15]);
-    delete reinterpret_cast<NetMsg::SVC_HLTV*>(netDataStructs[16]);
-    delete reinterpret_cast<NetMsg::SVC_Sounds*>(netDataStructs[17]);
-    delete reinterpret_cast<NetMsg::SVC_SetView*>(netDataStructs[18]);
-    delete reinterpret_cast<NetMsg::SVC_FixAngle*>(netDataStructs[19]);
-    delete reinterpret_cast<NetMsg::SVC_CrosshairAngle*>(netDataStructs[20]);
-    delete reinterpret_cast<NetMsg::SVC_BSPDecal*>(netDataStructs[21]);
-    delete reinterpret_cast<NetMsg::SVC_TerrainMod*>(netDataStructs[22]);
-    delete reinterpret_cast<NetMsg::SVC_UserMessage*>(netDataStructs[23]);
-    delete reinterpret_cast<NetMsg::SVC_EntityMessage*>(netDataStructs[24]);
-    delete reinterpret_cast<NetMsg::SVC_GameEvent*>(netDataStructs[25]);
-    delete reinterpret_cast<NetMsg::SVC_PacketEntities*>(netDataStructs[26]);
-    delete reinterpret_cast<NetMsg::SVC_TempEntities*>(netDataStructs[27]);
-    delete reinterpret_cast<NetMsg::SVC_Prefetch*>(netDataStructs[28]);
-    delete reinterpret_cast<NetMsg::SVC_Menu*>(netDataStructs[29]);
-    delete reinterpret_cast<NetMsg::SVC_GameEventList*>(netDataStructs[30]);
-    delete reinterpret_cast<NetMsg::SVC_GetCvarValue*>(netDataStructs[31]);
-}
-
-static void CreateDemMsgStructs(void* demDataStructs[9])
-{
-    demDataStructs[0] = new DemMsg::Dem_Unknown();
-    demDataStructs[1] = new DemMsg::Dem_Packet();
-    demDataStructs[2] = new DemMsg::Dem_Packet();
-    demDataStructs[3] = new DemMsg::Dem_SyncTick();
-    demDataStructs[4] = new DemMsg::Dem_ConsoleCmd();
-    demDataStructs[5] = new DemMsg::Dem_UserCmd();
-    demDataStructs[6] = new DemMsg::Dem_DataTables();
-    demDataStructs[7] = new DemMsg::Dem_Stop();
-    demDataStructs[8] = new DemMsg::Dem_StringTables();
-}
-
-static void DestroyDemMsgStructs(void* demDataStructs[9])
-{
-    delete reinterpret_cast<DemMsg::Dem_Unknown*>(demDataStructs[0]);
-    delete reinterpret_cast<DemMsg::Dem_Packet*>(demDataStructs[1]);
-    delete reinterpret_cast<DemMsg::Dem_Packet*>(demDataStructs[2]);
-    delete reinterpret_cast<DemMsg::Dem_SyncTick*>(demDataStructs[3]);
-    delete reinterpret_cast<DemMsg::Dem_ConsoleCmd*>(demDataStructs[4]);
-    delete reinterpret_cast<DemMsg::Dem_UserCmd*>(demDataStructs[5]);
-    delete reinterpret_cast<DemMsg::Dem_DataTables*>(demDataStructs[6]);
-    delete reinterpret_cast<DemMsg::Dem_Stop*>(demDataStructs[7]);
-    delete reinterpret_cast<DemMsg::Dem_StringTables*>(demDataStructs[8]);
-}
-
 PacketTrailingBits ParsePacket(uint8_t* packet, size_t length,
                                SourceGameContext& context, IDemoWriter* writer,
                                void* netDataStructs[32])
@@ -143,8 +44,8 @@ void DemoReader::ProcessDem(std::FILE* inputFp, IDemoWriter* writer)
 {
     void* netDataStructs[32];
     void* demDataStructs[9];
-    CreateNetMsgStructs(netDataStructs);
-    CreateDemMsgStructs(demDataStructs);
+    NetHandlers::CreateNetMsgStructs(netDataStructs);
+    DemHandlers::CreateDemMsgStructs(demDataStructs);
 
     SourceGameContext context = SourceGameContext();
     DemoFileReader reader(inputFp);
@@ -156,6 +57,7 @@ void DemoReader::ProcessDem(std::FILE* inputFp, IDemoWriter* writer)
     }
 
     CommandPacket packet;
+    int frame = -1;
     do
     {
         size_t rawDataSize = 0;
@@ -165,6 +67,7 @@ void DemoReader::ProcessDem(std::FILE* inputFp, IDemoWriter* writer)
 
         PacketTrailingBits trailingBits = PacketTrailingBits();
         writer->StartCommandPacket(packet);
+        frame += (packet.cmd == dem_packet);
         if (packet.cmd == dem_packet || packet.cmd == dem_signon)
         {
             Array<uint8_t> buffer = reader.ReadRawData(NET_MAX_PAYLOAD);
@@ -174,6 +77,6 @@ void DemoReader::ProcessDem(std::FILE* inputFp, IDemoWriter* writer)
     } while (packet.cmd != dem_stop);
     writer->EndWriting();
 
-    DestroyDemMsgStructs(demDataStructs);
-    DestroyNetMsgStructs(netDataStructs);
+    DemHandlers::DestroyDemMsgStructs(demDataStructs);
+    NetHandlers::DestroyNetMsgStructs(netDataStructs);
 }
diff --git a/demboyz/netmessages/nethandlers.cpp b/demboyz/netmessages/nethandlers.cpp
index 11b0306..27107ca 100644
--- a/demboyz/netmessages/nethandlers.cpp
+++ b/demboyz/netmessages/nethandlers.cpp
@@ -3,6 +3,78 @@
 #include "netmessages.h"
 #include <cassert>
 
+void NetHandlers::CreateNetMsgStructs(void* netDataStructs[32])
+{
+    netDataStructs[0] = new NetMsg::Net_NOP();
+    netDataStructs[1] = new NetMsg::Net_Disconnect();
+    netDataStructs[2] = new NetMsg::Net_File();
+    netDataStructs[3] = new NetMsg::Net_Tick();
+    netDataStructs[4] = new NetMsg::Net_StringCmd();
+    netDataStructs[5] = new NetMsg::Net_SetConVar();
+    netDataStructs[6] = new NetMsg::Net_SignonState();
+    netDataStructs[7] = new NetMsg::SVC_Print();
+    netDataStructs[8] = new NetMsg::SVC_ServerInfo();
+    netDataStructs[9] = new NetMsg::SVC_SendTable();
+    netDataStructs[10] = new NetMsg::SVC_ClassInfo();
+    netDataStructs[11] = new NetMsg::SVC_SetPause();
+    netDataStructs[12] = new NetMsg::SVC_CreateStringTable();
+    netDataStructs[13] = new NetMsg::SVC_UpdateStringTable();
+    netDataStructs[14] = new NetMsg::SVC_VoiceInit();
+    netDataStructs[15] = new NetMsg::SVC_VoiceData();
+    netDataStructs[16] = new NetMsg::SVC_HLTV();
+    netDataStructs[17] = new NetMsg::SVC_Sounds();
+    netDataStructs[18] = new NetMsg::SVC_SetView();
+    netDataStructs[19] = new NetMsg::SVC_FixAngle();
+    netDataStructs[20] = new NetMsg::SVC_CrosshairAngle();
+    netDataStructs[21] = new NetMsg::SVC_BSPDecal();
+    netDataStructs[22] = new NetMsg::SVC_TerrainMod();
+    netDataStructs[23] = new NetMsg::SVC_UserMessage();
+    netDataStructs[24] = new NetMsg::SVC_EntityMessage();
+    netDataStructs[25] = new NetMsg::SVC_GameEvent();
+    netDataStructs[26] = new NetMsg::SVC_PacketEntities();
+    netDataStructs[27] = new NetMsg::SVC_TempEntities();
+    netDataStructs[28] = new NetMsg::SVC_Prefetch();
+    netDataStructs[29] = new NetMsg::SVC_Menu();
+    netDataStructs[30] = new NetMsg::SVC_GameEventList();
+    netDataStructs[31] = new NetMsg::SVC_GetCvarValue();
+}
+
+void NetHandlers::DestroyNetMsgStructs(void* netDataStructs[32])
+{
+    delete reinterpret_cast<NetMsg::Net_NOP*>(netDataStructs[0]);
+    delete reinterpret_cast<NetMsg::Net_Disconnect*>(netDataStructs[1]);
+    delete reinterpret_cast<NetMsg::Net_File*>(netDataStructs[2]);
+    delete reinterpret_cast<NetMsg::Net_Tick*>(netDataStructs[3]);
+    delete reinterpret_cast<NetMsg::Net_StringCmd*>(netDataStructs[4]);
+    delete reinterpret_cast<NetMsg::Net_SetConVar*>(netDataStructs[5]);
+    delete reinterpret_cast<NetMsg::Net_SignonState*>(netDataStructs[6]);
+    delete reinterpret_cast<NetMsg::SVC_Print*>(netDataStructs[7]);
+    delete reinterpret_cast<NetMsg::SVC_ServerInfo*>(netDataStructs[8]);
+    delete reinterpret_cast<NetMsg::SVC_SendTable*>(netDataStructs[9]);
+    delete reinterpret_cast<NetMsg::SVC_ClassInfo*>(netDataStructs[10]);
+    delete reinterpret_cast<NetMsg::SVC_SetPause*>(netDataStructs[11]);
+    delete reinterpret_cast<NetMsg::SVC_CreateStringTable*>(netDataStructs[12]);
+    delete reinterpret_cast<NetMsg::SVC_UpdateStringTable*>(netDataStructs[13]);
+    delete reinterpret_cast<NetMsg::SVC_VoiceInit*>(netDataStructs[14]);
+    delete reinterpret_cast<NetMsg::SVC_VoiceData*>(netDataStructs[15]);
+    delete reinterpret_cast<NetMsg::SVC_HLTV*>(netDataStructs[16]);
+    delete reinterpret_cast<NetMsg::SVC_Sounds*>(netDataStructs[17]);
+    delete reinterpret_cast<NetMsg::SVC_SetView*>(netDataStructs[18]);
+    delete reinterpret_cast<NetMsg::SVC_FixAngle*>(netDataStructs[19]);
+    delete reinterpret_cast<NetMsg::SVC_CrosshairAngle*>(netDataStructs[20]);
+    delete reinterpret_cast<NetMsg::SVC_BSPDecal*>(netDataStructs[21]);
+    delete reinterpret_cast<NetMsg::SVC_TerrainMod*>(netDataStructs[22]);
+    delete reinterpret_cast<NetMsg::SVC_UserMessage*>(netDataStructs[23]);
+    delete reinterpret_cast<NetMsg::SVC_EntityMessage*>(netDataStructs[24]);
+    delete reinterpret_cast<NetMsg::SVC_GameEvent*>(netDataStructs[25]);
+    delete reinterpret_cast<NetMsg::SVC_PacketEntities*>(netDataStructs[26]);
+    delete reinterpret_cast<NetMsg::SVC_TempEntities*>(netDataStructs[27]);
+    delete reinterpret_cast<NetMsg::SVC_Prefetch*>(netDataStructs[28]);
+    delete reinterpret_cast<NetMsg::SVC_Menu*>(netDataStructs[29]);
+    delete reinterpret_cast<NetMsg::SVC_GameEventList*>(netDataStructs[30]);
+    delete reinterpret_cast<NetMsg::SVC_GetCvarValue*>(netDataStructs[31]);
+}
+
 #define DECLARE_NET_HANDLER_ARRAY(funcname) \
     { \
         &NetHandlers::Net_NOP_##funcname, \
diff --git a/demboyz/netmessages/nethandlers.h b/demboyz/netmessages/nethandlers.h
index 2653c66..7f6c524 100644
--- a/demboyz/netmessages/nethandlers.h
+++ b/demboyz/netmessages/nethandlers.h
@@ -58,6 +58,9 @@ struct SourceGameContext
 
 namespace NetHandlers
 {
+    void CreateNetMsgStructs(void* netDataStructs[32]);
+    void DestroyNetMsgStructs(void* netDataStructs[32]);
+
     bool NetMsg_BitRead(uint32_t type, BitRead& bitbuf, SourceGameContext& context, void* data);
     bool NetMsg_BitWrite(uint32_t type, BitWrite& bitbuf, const SourceGameContext& context, void* data);
     bool NetMsg_JsonRead(uint32_t type, JsonRead& jsonbuf, SourceGameContext& context, void* data);