Looks promising. I may do a CS for this when I can.