Mediator Class added, TODO list updated