@redmunds, yes, this sounds good.  I'm going to put these test cases in and see if I can break the code.