I looks much better. Will have to try it. This part didn't sit right with me, it was a bit of *brain meltdown* trying to keep the existing tests running while cramming in this functionality. Thanks for the ideas!