Added custom events, updated todo