WIP: Don't like the regex route, but didn't want to lose my place if I back-out of alternatives.