Replying to: JohnPhilpin john.philpin.com

@JohnPhilpin Looks like a fairly substantial set of changes.

Simon Woods @SimonWoods