Here you go Jason. I refactored my "quick fix" into your suggested solution. Give it a look, and if it passes muster please merge it. Let's get this on stage so NU has a chance to play with it well before the meeting at 3.