Merge please, will you?

I've done some work. Review & merge if satisfactory.