Waveform functionality complete