Working on the events controller