ColorView progress
Fixing merge business w/ ArtifactLibrary.cs