Changed my regular expression around somewhat, looking pretty now!