I didn't thoroughly look through this code, but it looks like it can get the job done very nicely. Right now my feeble attempt is being used, but I'll see if I can swap it out and add this in instead.

Thanks!