I hope I'll still be able to diff my customisations back in. I hope not too much has changed.