Feature/analytics

I believe conflicts are resolved now!
Are you working on discard-count locally?