started adding a mediator class, we'll see how it goes next time. . .