Reverted the display class in preparation for rewrite.
Updated for rewrite to use data class
Prepared Display class for rewrite to use data.