Added a new class and started working on listener