More specific utilities.
Change waveform return, split out the timeform.