Didn't follow what you wanted for this so untouched in the rebased version.