Done, though I've not static'd the functions... is there a big advantage to gain here (asides from making it slightly harder to UT :-) ).?