Live FFT things
Merge fixing