Jeremy,

Is this ready to be merged or do you have to add the above from Tom?