ColorMap refactor in progress