Moved code from Colour branch