massive reconfiguration time again.

A little foreshadowing of what's up front???