Added Color class to clean things up