mediator and base model prepared to merge to develop