Closes #234 (closed)
The syntax here is a little simpler now after previous changes to the waveform generator.