I think we might as well remove the concept of colour from this section of code too.