Looking good, will make a nicely sorted example for the next owner