@johnj ping? I think we can merge this as soon as this last thing is done :)