I'm going to merge, but will look at this further tomorrow.