Fiddled with the regexes a little.

I need to keep going on this, I need to find some time to really sit down with this
for a little bit and get it going. But I think it'll work.