Controller

Worked on handling events