Wip/bump analytics

Review by @eed3si9n