Added some regex
Some more generalizing and started with google analytics