Events

Count up events, and also fix PR pieces. Required for theodi/shared#168