attempt to move to single regex. failing so far.