34 files changed, 56 insertions, 134 deletions

diff --git a/pkg/messages/types/netDisconnect.go b/pkg/messages/types/netDisconnect.go
index c2e22c1..ac5139f 100644
--- a/pkg/messages/types/netDisconnect.go
+++ b/pkg/messages/types/netDisconnect.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type NetDisconnect struct {
@@ -13,6 +12,5 @@ func ParseNetDisconnect(reader *bitreader.Reader) NetDisconnect {
         netDisconnect := NetDisconnect{
                 Text: reader.TryReadString(),
         }
-        writer.TempAppendLine("\t\tText: %s", netDisconnect.Text)
         return netDisconnect
 }
diff --git a/pkg/messages/types/netFile.go b/pkg/messages/types/netFile.go
index 4ebd770..fc65229 100644
--- a/pkg/messages/types/netFile.go
+++ b/pkg/messages/types/netFile.go
@@ -4,7 +4,6 @@ import (
         "fmt"
 
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type NetFile struct {
@@ -40,8 +39,6 @@ func ParseNetFile(reader *bitreader.Reader) NetFile {
                 FileName:   reader.TryReadString(),
                 FileFlags:  NetFileFlags(reader.TryReadBits(2)).String(),
         }
-        writer.TempAppendLine("\t\tTransfer ID: %d", netFile.TransferId)
-        writer.TempAppendLine("\t\tFile Name: %s", netFile.FileName)
-        writer.TempAppendLine("\t\tFile Flags: %s", netFile.FileFlags)
+
         return netFile
 }
diff --git a/pkg/messages/types/netNop.go b/pkg/messages/types/netNop.go
index 0ee1d0d..826da6b 100644
--- a/pkg/messages/types/netNop.go
+++ b/pkg/messages/types/netNop.go
@@ -2,12 +2,11 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type NetNop struct{}
 
 func ParseNetNop(reader *bitreader.Reader) NetNop {
-        writer.TempAppendLine("\t\t{}")
+
         return NetNop{}
 }
diff --git a/pkg/messages/types/netSetConVar.go b/pkg/messages/types/netSetConVar.go
index 530cb6b..03e9e0d 100644
--- a/pkg/messages/types/netSetConVar.go
+++ b/pkg/messages/types/netSetConVar.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type NetSetConVar struct {
@@ -18,13 +17,13 @@ type conVar struct {
 func ParseNetSetConVar(reader *bitreader.Reader) NetSetConVar {
         length := reader.TryReadUInt8()
         convars := []conVar{}
-        writer.TempAppendLine("\t\tLength: %d", length)
+
         for count := 0; count < int(length); count++ {
                 convar := conVar{
                         Name:  reader.TryReadString(),
                         Value: reader.TryReadString(),
                 }
-                writer.TempAppendLine("\t\t[%d] %s: %s", count, convar.Name, convar.Value)
+
                 convars = append(convars, convar)
         }
         return NetSetConVar{
diff --git a/pkg/messages/types/netSignOnState.go b/pkg/messages/types/netSignOnState.go
index f784b0a..65e17a4 100644
--- a/pkg/messages/types/netSignOnState.go
+++ b/pkg/messages/types/netSignOnState.go
@@ -4,7 +4,6 @@ import (
         "fmt"
 
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type NetSignOnState struct {
@@ -60,17 +59,15 @@ func ParseNetSignOnState(reader *bitreader.Reader) NetSignOnState {
                 NumServerPlayers: reader.TryReadUInt32(),
                 IdsLength:        reader.TryReadUInt32(),
         }
-        writer.TempAppendLine("\t\tSign On State: %s", netSignOnState.SignOnState)
-        writer.TempAppendLine("\t\tSpawn Count: %d", netSignOnState.SpawnCount)
-        writer.TempAppendLine("\t\tNumber Of Server Players: %d", netSignOnState.NumServerPlayers)
+
         if netSignOnState.IdsLength > 0 {
                 netSignOnState.PlayersNetworksIds = reader.TryReadBytesToSlice(uint64(netSignOnState.IdsLength))
-                writer.TempAppendLine("\t\tPlayer Network IDs: %v", netSignOnState.PlayersNetworksIds)
+
         }
         netSignOnState.MapNameLength = reader.TryReadUInt32()
         if netSignOnState.MapNameLength > 0 {
                 netSignOnState.MapName = reader.TryReadStringLength(uint64(netSignOnState.MapNameLength))
-                writer.TempAppendLine("\t\tMap Name: %s", netSignOnState.MapName)
+
         }
         return netSignOnState
 }
diff --git a/pkg/messages/types/netSplitScreenUser.go b/pkg/messages/types/netSplitScreenUser.go
index 6068a28..8b14f63 100644
--- a/pkg/messages/types/netSplitScreenUser.go
+++ b/pkg/messages/types/netSplitScreenUser.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type NetSplitScreenUser struct {
@@ -13,6 +12,6 @@ func ParseNetSplitScreenUser(reader *bitreader.Reader) NetSplitScreenUser {
         netSplitScreenUser := NetSplitScreenUser{
                 Slot: reader.TryReadBool(),
         }
-        writer.TempAppendLine("\t\tSlot: %t", netSplitScreenUser.Slot)
+
         return netSplitScreenUser
 }
diff --git a/pkg/messages/types/netStringCmd.go b/pkg/messages/types/netStringCmd.go
index 57ae813..2f7e830 100644
--- a/pkg/messages/types/netStringCmd.go
+++ b/pkg/messages/types/netStringCmd.go
@@ -1,10 +1,7 @@
 package messages
 
 import (
-        "strings"
-
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type NetStringCmd struct {
@@ -15,6 +12,6 @@ func ParseNetStringCmd(reader *bitreader.Reader) NetStringCmd {
         netStringCmd := NetStringCmd{
                 Command: reader.TryReadString(),
         }
-        writer.TempAppendLine("\t\tCommand: \"%s\"", strings.TrimSpace(netStringCmd.Command))
+
         return netStringCmd
 }
diff --git a/pkg/messages/types/netTick.go b/pkg/messages/types/netTick.go
index 1c01171..49e997e 100644
--- a/pkg/messages/types/netTick.go
+++ b/pkg/messages/types/netTick.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type NetTick struct {
@@ -17,8 +16,6 @@ func ParseNetTick(reader *bitreader.Reader) NetTick {
                 HostFrameTime:             float32(reader.TryReadUInt16()) / 1e5,
                 HostFrameTimeStdDeviation: float32(reader.TryReadUInt16()) / 1e5,
         }
-        writer.TempAppendLine("\t\tTick: %d", netTick.Tick)
-        writer.TempAppendLine("\t\tHost Frame Time: %f", netTick.HostFrameTime)
-        writer.TempAppendLine("\t\tHost Frame Time Std Deviation: %f", netTick.HostFrameTimeStdDeviation)
+
         return netTick
 }
diff --git a/pkg/messages/types/svcBspDecal.go b/pkg/messages/types/svcBspDecal.go
index cf94c1d..6bf96a3 100644
--- a/pkg/messages/types/svcBspDecal.go
+++ b/pkg/messages/types/svcBspDecal.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcBspDecal struct {
@@ -28,11 +27,7 @@ func ParseSvcBspDecal(reader *bitreader.Reader) SvcBspDecal {
                 svcBspDecal.ModelIndex = uint16(reader.TryReadBits(11))
         }
         svcBspDecal.LowPriority = reader.TryReadBool()
-        writer.TempAppendLine("\t\tPosition: %v", svcBspDecal.Pos)
-        writer.TempAppendLine("\t\tDecal Texture Index: %d", svcBspDecal.DecalTextureIndex)
-        writer.TempAppendLine("\t\tEntity Index: %d", svcBspDecal.EntityIndex)
-        writer.TempAppendLine("\t\tModel Index: %d", svcBspDecal.ModelIndex)
-        writer.TempAppendLine("\t\tLow Priority: %t", svcBspDecal.LowPriority)
+
         return svcBspDecal
 }
 
diff --git a/pkg/messages/types/svcClassInfo.go b/pkg/messages/types/svcClassInfo.go
index 384c501..4677946 100644
--- a/pkg/messages/types/svcClassInfo.go
+++ b/pkg/messages/types/svcClassInfo.go
@@ -4,7 +4,6 @@ import (
         "math"
 
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcClassInfo struct {
@@ -25,19 +24,19 @@ func ParseSvcClassInfo(reader *bitreader.Reader) SvcClassInfo {
                 CreateOnClient: reader.TryReadBool(),
         }
         classes := []serverClass{}
-        writer.TempAppendLine("\t\tCreate On Client: %t", svcClassInfo.CreateOnClient)
+
         if !svcClassInfo.CreateOnClient {
-                writer.TempAppendLine("\t\t%d Server Classes:", svcClassInfo.ClassCount)
+
                 for count := 0; count < int(svcClassInfo.ClassCount); count++ {
                         classes = append(classes, serverClass{
                                 ClassId:       int16(reader.TryReadBits(uint64(math.Log2(float64(svcClassInfo.ClassCount)) + 1))),
                                 ClassName:     reader.TryReadString(),
                                 DataTableName: reader.TryReadString(),
                         })
-                        writer.TempAppendLine("\t\t\t[%d] %s (%s)", classes[len(classes)-1].ClassId, classes[len(classes)-1].ClassName, classes[len(classes)-1].DataTableName)
+
                 }
         } else {
-                writer.TempAppendLine("\t\t%d Server Classes", svcClassInfo.ClassCount)
+
         }
         svcClassInfo.ServerClasses = classes
         return svcClassInfo
diff --git a/pkg/messages/types/svcCmdKeyValues.go b/pkg/messages/types/svcCmdKeyValues.go
index 5c80d0b..61d6290 100644
--- a/pkg/messages/types/svcCmdKeyValues.go
+++ b/pkg/messages/types/svcCmdKeyValues.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcCmdKeyValues struct {
@@ -15,6 +14,6 @@ func ParseSvcCmdKeyValues(reader *bitreader.Reader) SvcCmdKeyValues {
                 Length: reader.TryReadUInt32(),
         }
         svcCmdKeyValues.Data = reader.TryReadBytesToSlice(uint64(svcCmdKeyValues.Length))
-        writer.TempAppendLine("\t\tData: %v", svcCmdKeyValues.Data)
+
         return svcCmdKeyValues
 }
diff --git a/pkg/messages/types/svcCreateStringTable.go b/pkg/messages/types/svcCreateStringTable.go
index ff2e27d..8d36fcf 100644
--- a/pkg/messages/types/svcCreateStringTable.go
+++ b/pkg/messages/types/svcCreateStringTable.go
@@ -4,7 +4,6 @@ import (
         "math"
 
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcCreateStringTable struct {
@@ -32,13 +31,7 @@ func ParseSvcCreateStringTable(reader *bitreader.Reader) SvcCreateStringTable {
                 svcCreateStringTable.UserDataSizeBits = int8(reader.TryReadBits(4))
         }
         svcCreateStringTable.Flags = int8(reader.TryReadBits(2))
-        writer.TempAppendLine("\t\tName: %s", svcCreateStringTable.Name)
-        writer.TempAppendLine("\t\tMax Enties: %d", svcCreateStringTable.MaxEntries)
-        writer.TempAppendLine("\t\tNumber Of Entiries: %d", svcCreateStringTable.NumEntries)
-        writer.TempAppendLine("\t\tUser Data Fixed Size: %t", svcCreateStringTable.UserDataFixedSize)
-        writer.TempAppendLine("\t\tUser Data Size: %d", svcCreateStringTable.UserDataSize)
-        writer.TempAppendLine("\t\tUser Data Size In Bits: %d", svcCreateStringTable.UserDataSizeBits)
-        writer.TempAppendLine("\t\tFlags: %d", svcCreateStringTable.Flags)
+
         reader.SkipBits(uint64(svcCreateStringTable.Length)) // TODO: StringTable parsing
         return svcCreateStringTable
 }
diff --git a/pkg/messages/types/svcCrosshairAngle.go b/pkg/messages/types/svcCrosshairAngle.go
index efd6d77..f689876 100644
--- a/pkg/messages/types/svcCrosshairAngle.go
+++ b/pkg/messages/types/svcCrosshairAngle.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcCrosshairAngle struct {
@@ -23,8 +22,6 @@ func ParseSvcCrosshairAngle(reader *bitreader.Reader) SvcCrosshairAngle {
                         Z: float32(reader.TryReadBits(16)),
                 },
         }
-        writer.TempAppendLine("\t\tX: %f", svcCrosshairAngle.Angle.X)
-        writer.TempAppendLine("\t\tY: %f", svcCrosshairAngle.Angle.Y)
-        writer.TempAppendLine("\t\tZ: %f", svcCrosshairAngle.Angle.Z)
+
         return svcCrosshairAngle
 }
diff --git a/pkg/messages/types/svcEntityMessage.go b/pkg/messages/types/svcEntityMessage.go
index a511fea..c4676ec 100644
--- a/pkg/messages/types/svcEntityMessage.go
+++ b/pkg/messages/types/svcEntityMessage.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcEntityMessage struct {
@@ -19,8 +18,6 @@ func ParseSvcEntityMessage(reader *bitreader.Reader) SvcEntityMessage {
                 Length:      uint16(reader.TryReadBits(11)),
         }
         svcEntityMessage.Data = reader.TryReadBitsToSlice(uint64(svcEntityMessage.Length))
-        writer.TempAppendLine("\t\tEntity Index: %d", svcEntityMessage.EntityIndex)
-        writer.TempAppendLine("\t\tClass ID: %d", svcEntityMessage.ClassId)
-        writer.TempAppendLine("\t\tData: %v", svcEntityMessage.Data)
+
         return svcEntityMessage
 }
diff --git a/pkg/messages/types/svcFixAngle.go b/pkg/messages/types/svcFixAngle.go
index b79c02d..f00c239 100644
--- a/pkg/messages/types/svcFixAngle.go
+++ b/pkg/messages/types/svcFixAngle.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcFixAngle struct {
@@ -25,9 +24,6 @@ func ParseSvcFixAngle(reader *bitreader.Reader) SvcFixAngle {
                         Z: float32(reader.TryReadBits(16)),
                 },
         }
-        writer.TempAppendLine("\t\tRelative: %t", svcFixAngle.Relative)
-        writer.TempAppendLine("\t\tX: %f", svcFixAngle.Angle.X)
-        writer.TempAppendLine("\t\tY: %f", svcFixAngle.Angle.Y)
-        writer.TempAppendLine("\t\tZ: %f", svcFixAngle.Angle.Z)
+
         return svcFixAngle
 }
diff --git a/pkg/messages/types/svcGameEvent.go b/pkg/messages/types/svcGameEvent.go
index e12d75a..ec96653 100644
--- a/pkg/messages/types/svcGameEvent.go
+++ b/pkg/messages/types/svcGameEvent.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcGameEvent struct {
@@ -15,6 +14,6 @@ func ParseSvcGameEvent(reader *bitreader.Reader) SvcGameEvent {
                 Length: uint16(reader.TryReadBits(11)),
         }
         svcGameEvent.Data = reader.TryReadBitsToSlice(uint64(svcGameEvent.Length))
-        writer.TempAppendLine("\t\tData: %v", svcGameEvent.Data)
+
         return svcGameEvent
 }
diff --git a/pkg/messages/types/svcGameEventList.go b/pkg/messages/types/svcGameEventList.go
index 1fa7589..ca2cf76 100644
--- a/pkg/messages/types/svcGameEventList.go
+++ b/pkg/messages/types/svcGameEventList.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcGameEventList struct {
@@ -20,6 +19,6 @@ func ParseSvcGameEventList(reader *bitreader.Reader) SvcGameEventList {
                 Length: int32(reader.TryReadBits(20)),
         }
         reader.TryReadBitsToSlice(uint64(svcGameEventList.Length))
-        writer.TempAppendLine("\t\tEvents: %d", svcGameEventList.Events)
+
         return svcGameEventList
 }
diff --git a/pkg/messages/types/svcGetCvarValue.go b/pkg/messages/types/svcGetCvarValue.go
index 939e6b6..b0513d0 100644
--- a/pkg/messages/types/svcGetCvarValue.go
+++ b/pkg/messages/types/svcGetCvarValue.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcGetCvarValue struct {
@@ -15,7 +14,6 @@ func ParseSvcGetCvarValue(reader *bitreader.Reader) SvcGetCvarValue {
                 Cookie:   reader.TryReadSInt32(),
                 CvarName: reader.TryReadString(),
         }
-        writer.TempAppendLine("\t\tCookie: %d", svcGetCvarValue.Cookie)
-        writer.TempAppendLine("\t\tCvar: \"%s\"", svcGetCvarValue.CvarName)
+
         return svcGetCvarValue
 }
diff --git a/pkg/messages/types/svcMenu.go b/pkg/messages/types/svcMenu.go
index 33ccb70..df14048 100644
--- a/pkg/messages/types/svcMenu.go
+++ b/pkg/messages/types/svcMenu.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcMenu struct {
@@ -17,7 +16,6 @@ func ParseSvcMenu(reader *bitreader.Reader) SvcMenu {
                 Length: reader.TryReadUInt32(),
         }
         svcMenu.Data = reader.TryReadBitsToSlice(uint64(svcMenu.Length))
-        writer.TempAppendLine("\t\tType: %d", svcMenu.Type)
-        writer.TempAppendLine("\t\tData: %v", svcMenu.Data)
+
         return svcMenu
 }
diff --git a/pkg/messages/types/svcPacketEntities.go b/pkg/messages/types/svcPacketEntities.go
index 05b6794..8000a55 100644
--- a/pkg/messages/types/svcPacketEntities.go
+++ b/pkg/messages/types/svcPacketEntities.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcPacketEntities struct {
@@ -31,12 +30,6 @@ func ParseSvcPacketEntities(reader *bitreader.Reader) SvcPacketEntities {
         svcPacketEntities.Length = uint32(reader.TryReadBits(20))
         svcPacketEntities.UpdatedBaseline = reader.TryReadBool()
         svcPacketEntities.Data = reader.TryReadBitsToSlice(uint64(svcPacketEntities.Length))
-        writer.TempAppendLine("\t\tMax Entries: %d", svcPacketEntities.MaxEntries)
-        writer.TempAppendLine("\t\tIs Delta: %t", svcPacketEntities.IsDelta)
-        writer.TempAppendLine("\t\tDelta From: %d", svcPacketEntities.DeltaFrom)
-        writer.TempAppendLine("\t\tBaseline: %t", svcPacketEntities.BaseLine)
-        writer.TempAppendLine("\t\tUpdated Baseline: %t", svcPacketEntities.UpdatedBaseline)
-        writer.TempAppendLine("\t\t%d Updated Entries:", svcPacketEntities.UpdatedEntries)
-        writer.TempAppendLine("\t\tData: %v", svcPacketEntities.Data)
+
         return svcPacketEntities
 }
diff --git a/pkg/messages/types/svcPaintmapData.go b/pkg/messages/types/svcPaintmapData.go
index 40f6ad0..49aa433 100644
--- a/pkg/messages/types/svcPaintmapData.go
+++ b/pkg/messages/types/svcPaintmapData.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcPaintmapData struct {
@@ -15,6 +14,6 @@ func ParseSvcPaintmapData(reader *bitreader.Reader) SvcPaintmapData {
                 Length: reader.TryReadUInt32(),
         }
         svcPaintmapData.Data = reader.TryReadBitsToSlice(uint64(svcPaintmapData.Length))
-        writer.TempAppendLine("\t\tData: %v", svcPaintmapData.Data)
+
         return svcPaintmapData
 }
diff --git a/pkg/messages/types/svcPrefetch.go b/pkg/messages/types/svcPrefetch.go
index b71e61f..a9a88fe 100644
--- a/pkg/messages/types/svcPrefetch.go
+++ b/pkg/messages/types/svcPrefetch.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcPrefetch struct {
@@ -13,6 +12,6 @@ func ParseSvcPrefetch(reader *bitreader.Reader) SvcPrefetch {
         svcPrefetch := SvcPrefetch{
                 SoundIndex: int16(reader.TryReadBits(13)),
         }
-        writer.TempAppendLine("\t\tSound Index: %d", svcPrefetch.SoundIndex)
+
         return svcPrefetch
 }
diff --git a/pkg/messages/types/svcPrint.go b/pkg/messages/types/svcPrint.go
index 760a3c5..7b3b388 100644
--- a/pkg/messages/types/svcPrint.go
+++ b/pkg/messages/types/svcPrint.go
@@ -1,10 +1,13 @@
 package messages
 
 import (
+        "fmt"
+        "regexp"
+        "strconv"
         "strings"
 
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
+        "github.com/pektezol/demoparser/pkg/verification"
 )
 
 type SvcPrint struct {
@@ -16,6 +19,19 @@ func ParseSvcPrint(reader *bitreader.Reader) SvcPrint {
                 Message: reader.TryReadString(),
         }
         // common psycopath behaviour
-        writer.TempAppendLine("\t\t%s", strings.Replace(strings.ReplaceAll(strings.ReplaceAll(svcPrint.Message, "\n", "\n\t\t"), "\n\t\t\n\t\t", ""), "\n\t\t", "", 1))
+        print := fmt.Sprintf("\t\t%s\n", strings.Replace(strings.ReplaceAll(strings.ReplaceAll(svcPrint.Message, "\n", "\n\t\t"), "\n\t\t\n\t\t", ""), "\n\t\t", "", 1))
+        // Define a regular expression pattern to match the "Server Number" line and capture the integer value.
+        pattern := `Server Number: (\d+)`
+
+        // Compile the regular expression pattern.
+        re := regexp.MustCompile(pattern)
+
+        // Find the match in the text.
+        match := re.FindStringSubmatch(print)
+        if len(match) >= 1 {
+                serverNumber := match[1]
+                n, _ := strconv.Atoi(serverNumber)
+                verification.ServerNumbers = append(verification.ServerNumbers, n)
+        }
         return svcPrint
 }
diff --git a/pkg/messages/types/svcSendTable.go b/pkg/messages/types/svcSendTable.go
index 78df195..4397db0 100644
--- a/pkg/messages/types/svcSendTable.go
+++ b/pkg/messages/types/svcSendTable.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcSendTable struct {
@@ -17,8 +16,6 @@ func ParseSvcSendTable(reader *bitreader.Reader) SvcSendTable {
                 Length:       reader.TryReadUInt8(),
         }
         svcSendTable.Props = uint32(reader.TryReadBits(uint64(svcSendTable.Length)))
-        writer.TempAppendLine("\t\tNeeds Decoder: %t", svcSendTable.NeedsDecoder)
-        writer.TempAppendLine("\t\tLength: %d", svcSendTable.Length)
-        writer.TempAppendLine("\t\tProps: %d", svcSendTable.Props)
+
         return svcSendTable
 }
diff --git a/pkg/messages/types/svcServerInfo.go b/pkg/messages/types/svcServerInfo.go
index a6acd53..507b7ca 100644
--- a/pkg/messages/types/svcServerInfo.go
+++ b/pkg/messages/types/svcServerInfo.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcServerInfo struct {
@@ -43,21 +42,6 @@ func ParseSvcServerInfo(reader *bitreader.Reader) SvcServerInfo {
                 SkyName:          reader.TryReadString(),
                 HostName:         reader.TryReadString(),
         }
-        writer.TempAppendLine("\t\tNetwork Protocol: %d", svcServerInfo.Protocol)
-        writer.TempAppendLine("\t\tServer Count: %d", svcServerInfo.ServerCount)
-        writer.TempAppendLine("\t\tIs Hltv: %t", svcServerInfo.IsHltv)
-        writer.TempAppendLine("\t\tIs Dedicated: %t", svcServerInfo.IsDedicated)
-        writer.TempAppendLine("\t\tServer Client CRC: %d", svcServerInfo.ClientCrc)
-        writer.TempAppendLine("\t\tString Table CRC: %d", svcServerInfo.StringTableCrc)
-        writer.TempAppendLine("\t\tMax Server Classes: %d", svcServerInfo.MaxServerClasses)
-        writer.TempAppendLine("\t\tServer Map CRC: %d", svcServerInfo.MapCrc)
-        writer.TempAppendLine("\t\tCurrent Player Count: %d", svcServerInfo.PlayerCount)
-        writer.TempAppendLine("\t\tMax Player Count: %d", svcServerInfo.MaxClients)
-        writer.TempAppendLine("\t\tInterval Per Tick: %f", svcServerInfo.TickInterval)
-        writer.TempAppendLine("\t\tPlatform: %s", svcServerInfo.Platform)
-        writer.TempAppendLine("\t\tGame Directory: %s", svcServerInfo.GameDir)
-        writer.TempAppendLine("\t\tMap Name: %s", svcServerInfo.MapName)
-        writer.TempAppendLine("\t\tSky Name: %s", svcServerInfo.SkyName)
-        writer.TempAppendLine("\t\tHost Name: %s", svcServerInfo.HostName)
+
         return svcServerInfo
 }
diff --git a/pkg/messages/types/svcSetPause.go b/pkg/messages/types/svcSetPause.go
index d979ac5..1f6f25f 100644
--- a/pkg/messages/types/svcSetPause.go
+++ b/pkg/messages/types/svcSetPause.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcSetPause struct {
@@ -13,6 +12,6 @@ func ParseSvcSetPause(reader *bitreader.Reader) SvcSetPause {
         svcSetPause := SvcSetPause{
                 Paused: reader.TryReadBool(),
         }
-        writer.TempAppendLine("\t\tPaused: %t", svcSetPause.Paused)
+
         return svcSetPause
 }
diff --git a/pkg/messages/types/svcSetView.go b/pkg/messages/types/svcSetView.go
index bdb6203..a60d547 100644
--- a/pkg/messages/types/svcSetView.go
+++ b/pkg/messages/types/svcSetView.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcSetView struct {
@@ -13,6 +12,6 @@ func ParseSvcSetView(reader *bitreader.Reader) SvcSetView {
         svcSetView := SvcSetView{
                 EntityIndex: uint16(reader.TryReadBits(11)),
         }
-        writer.TempAppendLine("\t\tEntity Index: %d", svcSetView.EntityIndex)
+
         return svcSetView
 }
diff --git a/pkg/messages/types/svcSounds.go b/pkg/messages/types/svcSounds.go
index 1affeb4..34d99f6 100644
--- a/pkg/messages/types/svcSounds.go
+++ b/pkg/messages/types/svcSounds.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcSounds struct {
@@ -24,8 +23,6 @@ func ParseSvcSounds(reader *bitreader.Reader) SvcSounds {
                 svcSounds.Length = reader.TryReadUInt16()
         }
         svcSounds.Data = reader.TryReadBitsToSlice(uint64(svcSounds.Length))
-        writer.TempAppendLine("\t\tReliable Sound: %t", svcSounds.ReliableSound)
-        writer.TempAppendLine("\t\tSound Count: %d", svcSounds.SoundCount)
-        writer.TempAppendLine("\t\tData: %v", svcSounds.Data)
+
         return svcSounds
 }
diff --git a/pkg/messages/types/svcSplitScreen.go b/pkg/messages/types/svcSplitScreen.go
index 653438a..fc6acb4 100644
--- a/pkg/messages/types/svcSplitScreen.go
+++ b/pkg/messages/types/svcSplitScreen.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcSplitScreen struct {
@@ -17,7 +16,6 @@ func ParseSvcSplitScreen(reader *bitreader.Reader) SvcSplitScreen {
                 Length:     uint16(reader.TryReadBits(11)),
         }
         svcSplitScreen.Data = reader.TryReadBitsToSlice(uint64(svcSplitScreen.Length))
-        writer.TempAppendLine("\t\tRemove User: %t", svcSplitScreen.RemoveUser)
-        writer.TempAppendLine("\t\tData: %v", svcSplitScreen.Data)
+
         return svcSplitScreen
 }
diff --git a/pkg/messages/types/svcTempEntities.go b/pkg/messages/types/svcTempEntities.go
index 407bfd6..41b1afb 100644
--- a/pkg/messages/types/svcTempEntities.go
+++ b/pkg/messages/types/svcTempEntities.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcTempEntities struct {
@@ -17,7 +16,6 @@ func ParseSvcTempEntities(reader *bitreader.Reader) SvcTempEntities {
                 Length:     uint32(reader.TryReadBits(17)),
         }
         svcTempEntities.Data = reader.TryReadBitsToSlice(uint64(svcTempEntities.Length))
-        writer.TempAppendLine("\t\tNumber Of Entries: %d", svcTempEntities.NumEntries)
-        writer.TempAppendLine("\t\tData: %v", svcTempEntities.Data)
+
         return svcTempEntities
 }
diff --git a/pkg/messages/types/svcUpdateStringTable.go b/pkg/messages/types/svcUpdateStringTable.go
index 68c8fb5..ca716eb 100644
--- a/pkg/messages/types/svcUpdateStringTable.go
+++ b/pkg/messages/types/svcUpdateStringTable.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcUpdateStringTable struct {
@@ -21,7 +20,6 @@ func ParseSvcUpdateStringTable(reader *bitreader.Reader) SvcUpdateStringTable {
         }
         svcUpdateStringTable.Length = int32(reader.TryReadBits(20))
         svcUpdateStringTable.Data = reader.TryReadBitsToSlice(uint64(svcUpdateStringTable.Length))
-        writer.TempAppendLine("\t\tTable ID: %d", svcUpdateStringTable.TableId)
-        writer.TempAppendLine("\t\tNumber Of Changed Entries: %d", svcUpdateStringTable.NumChangedEntries)
+
         return svcUpdateStringTable
 }
diff --git a/pkg/messages/types/svcUserMessage.go b/pkg/messages/types/svcUserMessage.go
index e5b1943..a26f0ff 100644
--- a/pkg/messages/types/svcUserMessage.go
+++ b/pkg/messages/types/svcUserMessage.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcUserMessage struct {
@@ -89,8 +88,7 @@ func ParseSvcUserMessage(reader *bitreader.Reader) SvcUserMessage {
                 Length: int16(reader.TryReadBits(12)),
         }
         svcUserMessage.Data = reader.TryReadBitsToSlice(uint64(svcUserMessage.Length))
-        writer.TempAppendLine("\t\tType: %d", svcUserMessage.Type)
-        writer.TempAppendLine("\t\tData: %v", svcUserMessage.Data)
+
         return svcUserMessage
 }
 
diff --git a/pkg/messages/types/svcVoiceData.go b/pkg/messages/types/svcVoiceData.go
index c3e08ee..6ac8050 100644
--- a/pkg/messages/types/svcVoiceData.go
+++ b/pkg/messages/types/svcVoiceData.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcVoiceData struct {
@@ -21,8 +20,6 @@ func ParseSvcVoiceData(reader *bitreader.Reader) SvcVoiceData {
                 svcVoiceData.Proximity = true
         }
         svcVoiceData.Data = reader.TryReadBitsToSlice(uint64(svcVoiceData.Length))
-        writer.TempAppendLine("\t\tFrom Client: %d", svcVoiceData.FromClient)
-        writer.TempAppendLine("\t\tProximity: %t", svcVoiceData.Proximity)
-        writer.TempAppendLine("\t\tData: %v", svcVoiceData.Data)
+
         return svcVoiceData
 }
diff --git a/pkg/messages/types/svcVoiceInit.go b/pkg/messages/types/svcVoiceInit.go
index 03e0e25..eb6093f 100644
--- a/pkg/messages/types/svcVoiceInit.go
+++ b/pkg/messages/types/svcVoiceInit.go
@@ -2,7 +2,6 @@ package messages
 
 import (
         "github.com/pektezol/bitreader"
-        "github.com/pektezol/demoparser/pkg/writer"
 )
 
 type SvcVoiceInit struct {
@@ -25,8 +24,6 @@ func ParseSvcVoiceInit(reader *bitreader.Reader) SvcVoiceInit {
                         svcVoiceInit.SampleRate = 11025
                 }
         }
-        writer.TempAppendLine("\t\tCodec: %s", svcVoiceInit.Codec)
-        writer.TempAppendLine("\t\tQuality: %d", svcVoiceInit.Quality)
-        writer.TempAppendLine("\t\tSample Rate: %d", svcVoiceInit.SampleRate)
+
         return svcVoiceInit
 }