massive reconfiguration time again.

I think for now I'm just going to leave it alone. I've only cut the very minimal out for the duals. Take some time and think on it a bit...