Proper event creation

#16