This seems clunky.  May need to use a regex.