First stab at porting to Packet