That oughta do ya

I gotchya working and left you some detailed comments in the commit log on how I did it.