Committing cos I'm about to remove all that Regex shit I did. It's a
bad, lazy approach and it'll come back to haunt us