massive reconfiguration time again.

Well crap now I need to go get some squirt..