I've not managed to look at this yet, and won't get a chance for at least a couple more weeks, so I'm just going to merge this as is