Ckozak/compliance event

This TODO need to be done for this PR?