Adding mediator... for real this time