Added waveform unpacking stuff