Started work on waveforms