Work towards #7 by adding color coding