Regex working!! ( Thanks Arjun )
Moved a bunch of stuff into a configuration class