Tons of rework for next KSP version