Interim commit on wavelet stuff.