Added a bunch of regex stuff