Reorganized and got the display working.