My first Flux merge takes Dev, adds some detail and removes some censorship.

I'm actually not thrilled with this one... working on a better merge mix now and will replace this when that is ready.