Work on conversion to constraint-based