Feature/analytics

I believe conflicts are resolved now!
This service is actually a factory as it doesn't use/need a constructor.