Adding ChangeListMediator
Fixing indentation and switching to mediator