Adding in display logic