Add TODOs
Simplify event managment