Solver abstraction work underway