BF: This should be the mean of the non-S0 samples.
RF: Reshape once upfront and then again at the bottom.

To replace the acrobatics I was doing before.