Implemented packet changes, untested

Does compile