massive reconfiguration time again.

Almost done..