Untangling diffuse CAD: Light at the end of the tunnel?