More refinement to waveforms. Next step is to creat wavelets and sampling code.