massive reconfiguration time again.

Alright men let's save the race stuff between me and YR for the it's proper place, on with this quite difficult project please.