Waveform

Big pull request, deal with it, its a hackathon, etc etc