New, FINAL, diff file
Much tidying and sorting