Added logic and colours, yay