Added Waveform.hpp (though it might not be working for all options at the moment)