flesh out events
merge cj-events
merge fix