Removed the super fun async stuff, also added some regexes for extra protection