Feature/analytics

I believe conflicts are resolved now!