change some stuff
remove regexy
stop being clever kurtis
all working
Final working version