Add a 'proper' event counter. Need to make sure it's handling weights properly, then will remove manual count & weight tracking