massive reconfiguration time again.

The long days are starting and I'm able to get a little more done.