Added some temporary stuff to create/animate waveforms