Start work on module communication via a mediator (pattern).
A little cleanup for project hand in.