massive reconfiguration time again.

SWEET!!!