Added some of the FFT stuff
Merge
Fixed merge