Move a few things around. Add Waveform.EMPTY