Progressed work on merging new display with old code