Craig - colors
Craig - merge res