Started work on alternative display system
Committed left over changes