massive reconfiguration time again.

This is what I'm running now, I think...