Finally fixing the regexes. Wow scary