Updating Reader states to use the Mediator pattern. Also fixed a few violations. More work to do, but a MUCH cleaner implementation.