I like that solution.  I added the fix. @dnschneid , let me know your thoughts.