Attempt to refactor event reporter by way of rebuilding