Worked on first TODO of PacketHandler