Finally got the regex working right