Tidied several files + added beginnings of Regexes