Cleanup
Warping with two wavelets; not yet working