Started gutting logic from the Controller and Display classes.