Today I added another waveform object for the modulation features. I ended up writing things quite differently, but I believe it should have all the features. I also added phase modulation, which has been requested several times.