Packet Handling rework, more to do still