fixed git again
refactored code and created an API for waveforms