Good job with this. I forked it in case you get a change of heart.