Looks fine - this will never be pretty, but it is temporary code for an AB test...