Feature/events draft