Adjusting entities
Removing Mediator until a better Idea comes along