massive reconfiguration time again.

looks nice