WIP - Export event

Only remaining issues: #193, #194