Nice!!
I was actually thinking along the line of your first solution, but couldn't get figure out how to take care of the "or". I think this is just what I need.
Thanks!