massive reconfiguration time again.

Let me draw some lines on this to start mapping things out give me a sec