Okay, I've made all the other changes Steve suggested. How about we merge this PR and then you guys can rejigger that however it works best.