More work on display logic.