feature/analytics

Analytics proposal to follow.