Feature/analytics

This as well.