Added some functionality, regexes