d'oh finally getting the regex right?