Add colours
Move various functions