#27 - Replace Display class-based state machine with instance-based one.