More experimental changes to Packets (WIP)