Feature/analytics

It's only in the production file. Maybe I should also add it to base?