Feature/analytics

Bugs solved!