Updated rest of classes to new packets, untested