Small start to separation of logic and display