tinkering w how to add events
resolve merge conflict