moved Colour into it's own .h/.cpp