Continuing initial conversion to experimental Sketcher solver