Quick merge for testing, kept my createPacket() method and everything.