Reorganisation of code and back colouring #10