massive reconfiguration time again.

If ya wanna sell the electric water pump shoot me a PM.