Partial classes finally correct