Adding events is working but not fully checkable I think