Did some work on events

#257