Finished porting Generator to Packet