I know I said to do this :) It still doesn't feel quite right - we should revisit this.